@edgedev/firebase 2.0.6 → 2.0.8

package/edgeFirebase.ts

@@ -400,9 +400,14 @@ export const EdgeFirebase = class {
     this.unsubscibe['collection-data'] = unsubscribe
   }
 
-
+  private ruleHelperReset = async (): Promise<void> => {
+    const initRoleHelper = { uid: this.user.uid, 'edge-assignment-helper': {permissionType: "roles"} }
+    this.state.ruleHelpers['edge-assignment-helper'] = {permissionType: "roles"}
+    await setDoc(doc(this.db, "rule-helpers", this.user.uid), initRoleHelper);
+  }
 
   private startUserMetaSync = async (docSnap): Promise<void> => {
+    await this.ruleHelperReset();
     await this.startCollectionPermissionsSync()
     await this.initUserMetaPermissions(docSnap);
     this.user.loggedIn = true;
@@ -977,7 +982,12 @@ export const EdgeFirebase = class {
     }
     let index = collection.length;
     const ruleCheck: RuleCheck =  { permissionType: "", permissionCheckPath: "", fullPath: collectionPath.replaceAll("/", "-"), action };
-   
+    if (this.state.ruleHelpers[ruleKey]) {
+      const existingRuleHelper = this.state.ruleHelpers[ruleKey];
+      if (existingRuleHelper.fullPath === ruleCheck.fullPath && existingRuleHelper.action === ruleCheck.action) {
+        return;
+      }
+    }
     while (index > 0) {
       const collectionArray = JSON.parse(JSON.stringify(collection));
       const permissionCheck = collectionArray.splice(0, index).join("-");
@@ -1017,6 +1027,7 @@ export const EdgeFirebase = class {
     }
     const check = {[ruleKey]: ruleCheck,  uid: this.user.uid };
     await setDoc(doc(this.db, "rule-helpers", this.user.uid), check, { merge: true });
+    this.state.ruleHelpers[ruleKey] = ruleCheck;
   }
 
   public permissionCheckOnly = (action: action, collectionPath: string): boolean => {
@@ -1240,6 +1251,7 @@ export const EdgeFirebase = class {
     users: {},
     registrationCode: "",
     registrationMeta: {},
+    ruleHelpers: {},
   });
 
   public getDocData = async (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgedev/firebase",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "Vue 3 / Nuxt 3 Plugin or Nuxt 3 plugin for firebase authentication and firestore.",
   "main": "index.ts",
   "scripts": {

package/src/config.js

@@ -1,9 +1,14 @@
 const functions = require('firebase-functions')
+const { PubSub } = require('@google-cloud/pubsub')
 const admin = require('firebase-admin')
 
+const pubsub = new PubSub()
+
 admin.initializeApp()
 
-const { onCall, HttpsError } = require('firebase-functions/v2/https')
+const { onMessagePublished } = require('firebase-functions/v2/pubsub')
+
+const { onCall, HttpsError, onRequest } = require('firebase-functions/v2/https')
 const { onSchedule } = require('firebase-functions/v2/scheduler')
 const {
   onDocumentWritten,
@@ -19,6 +24,9 @@ const twilio = require('twilio')
 const db = getFirestore()
 
 module.exports = {
+  pubsub,
+  onMessagePublished,
+  onRequest,
   onSchedule,
   onDocumentWritten,
   onDocumentCreated,

package/src/edgeFirebase.js

@@ -1,8 +1,4 @@
-// TODO: THE permissionCheck will call a cloud function that will check the user's permissions also...
-// This could function will right to "rules-helpers" collction a document with the user's uid and the collection path and the permission
-// This will make the rules far more efficient and will allow for more complex rules // this only needs done really for snapshots... 
-// All the other document reads and writes should be made using a cloud functions exclusively and the cloud function will check the permissions
-const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db } = require('./config.js')
+const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db, onSchedule, pubsub } = require('./config.js')
 
 const authToken = process.env.TWILIO_AUTH_TOKEN
 const accountSid = process.env.TWILIO_SID
@@ -15,6 +11,52 @@ function formatPhoneNumber(phone) {
   return `+1${numericPhone}`
 }
 
+exports.topicQueue = onSchedule({ schedule: 'every 1 minutes', timeoutSeconds: 180 }, async (event) => {
+  const queuedTopicsRef = db.collection('topic-queue')
+  const snapshot = await queuedTopicsRef.get()
+
+  for (const doc of snapshot.docs) {
+    await db.runTransaction(async (transaction) => {
+      const docSnapshot = await transaction.get(doc.ref)
+      if (!docSnapshot.exists) {
+        throw new Error('Document does not exist!')
+      }
+      const emailData = docSnapshot.data()
+      const emailTimestamp = emailData.timestamp ? emailData.timestamp.toMillis() : 0
+      const delayTimestamp = emailData.minuteDelay ? emailTimestamp + emailData.minuteDelay * 60 * 1000 : 0
+      const currentTimestamp = Date.now()
+      // Check if current time is beyond the timestamp + minuteDelay, or if timestamp or minuteDelay is not set
+      if (emailTimestamp > currentTimestamp || currentTimestamp >= delayTimestamp || !emailData.timestamp || !emailData.minuteDelay) {
+        // Check if topic and payload exist and are not empty
+        if (emailData.topic && emailData.payload && emailData.topic.trim() !== '' && emailData.payload.trim() !== '') {
+          try {
+            await pubsub.topic(emailData.topic).publishMessage({ data: Buffer.from(JSON.stringify(emailData.payload)) })
+            // Delete the document after successfully publishing the message
+            transaction.delete(doc.ref)
+          }
+          catch (error) {
+            console.error(`Error publishing message to topic ${emailData.topic}:`, error)
+            // Increment retry count and set new delay
+            const retryCount = emailData.retry ? emailData.retry + 1 : 1
+            if (retryCount <= 3) {
+              const minuteDelay = retryCount === 1 ? 1 : retryCount === 2 ? 10 : 30
+              transaction.update(doc.ref, { retry: retryCount, minuteDelay })
+            }
+            else {
+              // Delete the document if there was an error publishing the topic after 3 retries
+              transaction.delete(doc.ref)
+            }
+          }
+        }
+        // Delete the document if topic or payload does not exist or is empty
+        else {
+          transaction.delete(doc.ref)
+        }
+      }
+    })
+  }
+})
+
 exports.sendVerificationCode = functions.https.onCall(async (data, context) => {
   const code = (Math.floor(Math.random() * 1000000) + 1000000).toString().substring(1)
   const phone = formatPhoneNumber(data.phone)
@@ -282,9 +324,9 @@ function setUser(userRef, newData, oldData, stagedDocId) {
     let userUpdate = { meta: newData.meta, stagedDocId }
 
     if (newData.meta && newData.meta.name) {
-      const publicUserRef = db.collection('public-users').doc(newData.uid)
+      const publicUserRef = db.collection('public-users').doc(newData.userId)
       const publicMeta = { name: newData.meta.name }
-      publicUserRef.set({ uid: newData.uid, meta: publicMeta, collectionPaths: newData.collectionPaths, userId: newData.uid })
+      publicUserRef.set({ uid: newData.uid, meta: publicMeta, collectionPaths: newData.collectionPaths, userId: newData.userId })
     }
 
     if (Object.prototype.hasOwnProperty.call(newData, 'roles')) {

package/src/firestore.rules

@@ -9,6 +9,14 @@ service cloud.firestore {
     allow delete: if false; 
   }
 
+  match /databases/{database}/documents/topic-queue/{topic} {
+    allow read: if false;
+    allow create: if false;  
+    allow update: if false; 
+    allow delete: if false; 
+  }
+
+
   match /databases/{database}/documents/public-users/{user} {
     allow read: if request.auth != null;
     allow list: if request.auth != null;
@@ -16,7 +24,7 @@ service cloud.firestore {
     allow update: if false; 
     allow delete: if false; 
   }
-  
+
   match /databases/{database}/documents/events/{event} {
     allow read: if false;
     allow create: if false;  
@@ -237,7 +245,7 @@ service cloud.firestore {
       }
       function checkPermission(collectionPath, permissionCheck) {
           let user = get(/databases/$(database)/documents/users/$(request.auth.uid)).data;
-          let skipPaths = ["collection-data", "users", "staged-users", "events", "rule-helpers", "phone-auth", "public-users"];
+          let skipPaths = ["collection-data", "users", "staged-users", "events", "rule-helpers", "phone-auth", "public-users", "topic-queue"];
           let ruleHelper = get(/databases/$(database)/documents/rule-helpers/$(request.auth.uid)).data;
           return !(collectionPath in skipPaths) &&
                  !(permissionCheck == "write" &&