@edgedev/firebase 2.0.9 → 2.0.11

package/edgeFirebase.ts

@@ -338,7 +338,7 @@ export const EdgeFirebase = class {
         this.user.specialPermissions = specialPermissions;
       }
     );
-    this.unsubscibe.userMeta = metaUnsubscribe;
+    this.unsubscribe.userMeta = metaUnsubscribe;
   };
 
   private startCollectionPermissionsSync = async (): Promise<void> => {
@@ -397,7 +397,7 @@ export const EdgeFirebase = class {
       });
       this.state.collectionPermissions = items;
     });
-    this.unsubscibe['collection-data'] = unsubscribe
+    this.unsubscribe['collection-data'] = unsubscribe
   }
 
   private ruleHelperReset = async (): Promise<void> => {
@@ -407,7 +407,8 @@ export const EdgeFirebase = class {
   }
 
   private startUserMetaSync = async (docSnap): Promise<void> => {
-    await this.ruleHelperReset();
+    // Took this out because if another client is logged in, it breaks the other client
+    // await this.ruleHelperReset();
     await this.startCollectionPermissionsSync()
     await this.initUserMetaPermissions(docSnap);
     this.user.loggedIn = true;
@@ -1171,10 +1172,10 @@ export const EdgeFirebase = class {
   };
 
   public logOut = (): void => {
-    for (const key of Object.keys(this.unsubscibe)) {
-      if (this.unsubscibe[key] instanceof Function) {
-        this.unsubscibe[key]();
-        this.unsubscibe[key] = null;
+    for (const key of Object.keys(this.unsubscribe)) {
+      if (this.unsubscribe[key] instanceof Function) {
+        this.unsubscribe[key]();
+        this.unsubscribe[key] = null;
         this.data[key] = {};
       }
     }
@@ -1229,7 +1230,7 @@ export const EdgeFirebase = class {
   // Simple Store Items (add matching key per firebase collection)
   public data: CollectionDataObject = reactive({});
 
-  public unsubscibe: CollectionUnsubscribeObject = reactive({});
+  public unsubscribe: CollectionUnsubscribeObject = reactive({});
   
   public user: UserDataObject = reactive({
     uid: null,
@@ -1502,7 +1503,7 @@ export const EdgeFirebase = class {
     const canRead = await this.permissionCheck("read", collectionPath + '/' + docId);
     this.data[collectionPath + '/' + docId] = {};
     this.stopSnapshot(collectionPath + '/' + docId);
-    this.unsubscibe[collectionPath + '/' + docId] = null;
+    this.unsubscribe[collectionPath + '/' + docId] = null;
     if (canRead) {
       const docRef = doc(this.db, collectionPath, docId);
       
@@ -1544,7 +1545,7 @@ export const EdgeFirebase = class {
             meta: {}
           }));
         });
-        this.unsubscibe[collectionPath + '/' + docId] = unsubscribe;
+        this.unsubscribe[collectionPath + '/' + docId] = unsubscribe;
       });
     } else {
       return this.sendResponse({
@@ -1565,10 +1566,9 @@ export const EdgeFirebase = class {
     const canRead = await this.permissionCheck("read", collectionPath);
     this.data[collectionPath] = {};
     this.stopSnapshot(collectionPath);
-    this.unsubscibe[collectionPath] = null;
+    this.unsubscribe[collectionPath] = null;
     if (canRead) {
       const q = this.getQuery(collectionPath, queryList, orderList, max);
-    
       return new Promise<actionResponse>((resolve, reject) => {
         let firstRun = true;
         const unsubscribe = onSnapshot(q, (querySnapshot) => {
@@ -1579,7 +1579,6 @@ export const EdgeFirebase = class {
             items[doc.id] = item;
           });
           this.data[collectionPath] = items;
-          this.unsubscibe[collectionPath] = unsubscribe;
           
           // Only resolve or reject the Promise on first run of onSnapshot
           if(firstRun) {
@@ -1607,6 +1606,7 @@ export const EdgeFirebase = class {
             meta: {}
           }));
         });
+        this.unsubscribe[collectionPath] = unsubscribe;
       });
     } else {
       return this.sendResponse({
@@ -1639,7 +1639,7 @@ export const EdgeFirebase = class {
               collectionPath.replaceAll('/', '-')
             )
           )
-          const unsubscibe = await onSnapshot(q, (querySnapshot) => {
+          const unsubscribe = await onSnapshot(q, (querySnapshot) => {
             const items = {};
             querySnapshot.forEach((doc) => {
               const user = doc.data();
@@ -1679,7 +1679,7 @@ export const EdgeFirebase = class {
             });
             this.state.users = items;
           });
-          this.unsubscibe["staged-users"] = unsubscibe;
+          this.unsubscribe["staged-users"] = unsubscribe;
         } else {
           const q = query(
             collection(this.db, "public-users"),
@@ -1689,7 +1689,7 @@ export const EdgeFirebase = class {
               collectionPath.replaceAll('/', '-')
             )
           )
-          const unsubscibe = await onSnapshot(q, (querySnapshot) => {
+          const unsubscribe = await onSnapshot(q, (querySnapshot) => {
             const items = {};
             querySnapshot.forEach((doc) => {
               const user = doc.data();
@@ -1703,7 +1703,7 @@ export const EdgeFirebase = class {
             });
             this.state.users = items;
           });
-          this.unsubscibe["staged-users"] = unsubscibe;
+          this.unsubscribe["staged-users"] = unsubscribe;
         }
       }
     };
@@ -2090,9 +2090,9 @@ export const EdgeFirebase = class {
   };
 
   public stopSnapshot = (collectionPath: string): void => {
-    if (this.unsubscibe[collectionPath] instanceof Function) {
-      this.unsubscibe[collectionPath]();
-      this.unsubscibe[collectionPath] = null;
+    if (this.unsubscribe[collectionPath] instanceof Function) {
+      this.unsubscribe[collectionPath]();
+      this.unsubscribe[collectionPath] = null;
     }
   };
 };

package/package.json

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

package/src/.env.development

@@ -0,0 +1,10 @@
+VITE_FIREBASE_API_KEY=
+VITE_FIREBASE_AUTH_DOMAIN=
+VITE_FIREBASE_PROJECT_ID=
+VITE_FIREBASE_STORAGE_BUCKET=
+VITE_FIREBASE_MESSAGING_SENDER_ID=
+VITE_FIREBASE_APP_ID=
+VITE_FIREBASE_MEASUREMENT_ID=
+VITE_FIREBASE_EMULATOR_AUTH=9099
+VITE_FIREBASE_EMULATOR_FIRESTORE=8080
+VITE_FIREBASE_EMULATOR_FUNCTIONS=5001

package/src/.env.production

@@ -0,0 +1,10 @@
+VITE_FIREBASE_API_KEY=
+VITE_FIREBASE_AUTH_DOMAIN=
+VITE_FIREBASE_PROJECT_ID=
+VITE_FIREBASE_STORAGE_BUCKET=
+VITE_FIREBASE_MESSAGING_SENDER_ID=
+VITE_FIREBASE_APP_ID=
+VITE_FIREBASE_MEASUREMENT_ID=
+VITE_FIREBASE_EMULATOR_AUTH=
+VITE_FIREBASE_EMULATOR_FIRESTORE=
+VITE_FIREBASE_EMULATOR_FUNCTIONS=

package/src/edgeFirebase.js

@@ -21,23 +21,23 @@ exports.topicQueue = onSchedule({ schedule: 'every 1 minutes', timeoutSeconds: 1
       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 docData = docSnapshot.data()
+      const emailTimestamp = docData.timestamp ? docData.timestamp.toMillis() : 0
+      const delayTimestamp = docData.minuteDelay ? emailTimestamp + docData.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) {
+      if (emailTimestamp > currentTimestamp || currentTimestamp >= delayTimestamp || !docData.timestamp || !docData.minuteDelay) {
         // Check if topic and payload exist and are not empty
-        if (emailData.topic && emailData.payload && emailData.topic.trim() !== '' && emailData.payload.trim() !== '') {
+        if (docData.topic && docData.payload && typeof docData.payload === 'object' && docData.topic.trim() !== '') {
           try {
-            await pubsub.topic(emailData.topic).publishMessage({ data: Buffer.from(JSON.stringify(emailData.payload)) })
+            await pubsub.topic(docData.topic).publishMessage({ data: Buffer.from(JSON.stringify(docData.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)
+            console.error(`Error publishing message to topic ${docData.topic}:`, error)
             // Increment retry count and set new delay
-            const retryCount = emailData.retry ? emailData.retry + 1 : 1
+            const retryCount = docData.retry ? docData.retry + 1 : 1
             if (retryCount <= 3) {
               const minuteDelay = retryCount === 1 ? 1 : retryCount === 2 ? 10 : 30
               transaction.update(doc.ref, { retry: retryCount, minuteDelay })

package/src/package.json

@@ -0,0 +1,26 @@
+{
+    "name": "functions",
+    "description": "Cloud Functions for Firebase",
+    "scripts": {
+        "serve": "firebase emulators:start --only functions",
+        "shell": "firebase functions:shell",
+        "start": "npm run shell",
+        "deploy": "firebase deploy --only functions",
+        "logs": "firebase functions:log"
+    },
+    "engines": {
+        "node": "16"
+    },
+    "main": "index.js",
+    "dependencies": {
+        "@google-cloud/pubsub": "^4.0.6",
+        "dotenv": "^16.3.1",
+        "firebase-admin": "^10.0.2",
+        "firebase-functions": "^4.5.0",
+        "twilio": "^4.18.0"
+    },
+    "devDependencies": {
+        "firebase-functions-test": "^0.2.0"
+    },
+    "private": true
+}

package/src/postinstall.sh

@@ -30,12 +30,27 @@ fi
 cp ./src/edgeFirebase.js "$project_root/functions/edgeFirebase.js"
 cp ./src/config.js "$project_root/functions/config.js"
 
-if [ ! -f "$project_root/.env.dev" ]; then
-  cp ./src/.env.dev "$project_root/.env.dev"
+if [ ! -f "$project_root/functions/.env.dev" ]; then
+  cp ./src/.env.dev "$project_root/functions/.env.dev"
 fi
 
-if [ ! -f "$project_root/.env.prod" ]; then
-  cp ./src/.env.prod "$project_root/.env.prod"
+if [ ! -f "$project_root/functions/.env.prod" ]; then
+  cp ./src/.env.prod "$project_root/functions/.env.prod"
+fi
+
+if [ ! -f "$project_root/.env.development" ]; then
+  cp ./src/.env.dev "$project_root/.env.development"
+fi
+
+if [ ! -f "$project_root/.env.production" ]; then
+  cp ./src/.env.prod "$project_root/functions/.env.production"
+fi
+
+if [ ! -f "$project_root/functions/package.json" ]; then
+  cp ./src/package.json "$project_root/functions/package.json"
+  cd "$project_root/functions"
+  npm install --no-audit --silent
+  cd "$project_root"
 fi
 
 [ "$(tail -c1 $project_root/functions/index.js)" != "" ] && echo "" >> "$project_root/functions/index.js"