@edgedev/firebase 2.0.1 → 2.0.4

package/edgeFirebase.ts

@@ -110,7 +110,7 @@ interface UserDataObject {
   firebaseUser: object;
   oAuthCredential: { accessToken: string; idToken: string;}
   loggedIn: boolean;
-  loggingIn: boolean;
+  loggingIn: boolean | null;
   logInError: boolean;
   logInErrorMessage: string;
   meta: object;
@@ -424,6 +424,7 @@ export const EdgeFirebase = class {
 
   private setOnAuthStateChanged = (): void => {
     onAuthStateChanged(this.auth, (userAuth) => {
+      console.log('onAuthStateChanged')
       const oldDiv = document.getElementById("recaptcha-container");
       if (oldDiv) oldDiv.remove();
       if (userAuth) {
@@ -1222,7 +1223,7 @@ export const EdgeFirebase = class {
   public user: UserDataObject = reactive({
     uid: null,
     email: "",
-    loggingIn: false,
+    loggingIn: null,
     loggedIn: false,
     logInError: false,
     logInErrorMessage: "",   
@@ -1667,6 +1668,30 @@ export const EdgeFirebase = class {
             this.state.users = items;
           });
           this.unsubscibe["staged-users"] = unsubscibe;
+        } else {
+          const q = query(
+            collection(this.db, "public-users"),
+            where(
+              "collectionPaths",
+              "array-contains",
+              collectionPath.replaceAll('/', '-')
+            )
+          )
+          const unsubscibe = await onSnapshot(q, (querySnapshot) => {
+            const items = {};
+            querySnapshot.forEach((doc) => {
+              const user = doc.data();
+              const docId = doc.id;
+              const item = {
+                docId,
+                meta: user.meta,
+                userId: user.userId,
+              }
+              items[doc.id] = item;
+            });
+            this.state.users = items;
+          });
+          this.unsubscibe["staged-users"] = unsubscibe;
         }
       }
     };

package/package.json

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

package/src/config.js

@@ -4,12 +4,28 @@ const admin = require('firebase-admin')
 admin.initializeApp()
 
 const { onCall, HttpsError } = require('firebase-functions/v2/https')
+const { onSchedule } = require('firebase-functions/v2/scheduler')
+const {
+  onDocumentWritten,
+  onDocumentCreated,
+  onDocumentUpdated,
+  onDocumentDeleted,
+  Change,
+  FirestoreEvent,
+} = require('firebase-functions/v2/firestore')
 const { logger } = require('firebase-functions/v2')
 const { getFirestore } = require('firebase-admin/firestore')
 const twilio = require('twilio')
 const db = getFirestore()
 
 module.exports = {
+  onSchedule,
+  onDocumentWritten,
+  onDocumentCreated,
+  onDocumentUpdated,
+  onDocumentDeleted,
+  Change,
+  FirestoreEvent,
   onCall,
   HttpsError,
   logger,
@@ -19,3 +35,4 @@ module.exports = {
   twilio,
   db,
 }
+

package/src/edgeFirebase.js

@@ -277,6 +277,12 @@ function setUser(userRef, newData, oldData, stagedDocId) {
   return userRef.get().then((user) => {
     let userUpdate = { meta: newData.meta, stagedDocId }
 
+    if (newData.meta && newData.meta.name) {
+      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.userId })
+    }
+
     if (Object.prototype.hasOwnProperty.call(newData, 'roles')) {
       userUpdate = { ...userUpdate, roles: newData.roles }
     }

package/src/firestore.rules

@@ -1,3 +1,4 @@
+rules_version = '2';
 // #EDGE FIREBASE RULES START
 service cloud.firestore {
 
@@ -8,6 +9,14 @@ service cloud.firestore {
     allow delete: if false; 
   }
 
+  match /databases/{database}/documents/public-users/{user} {
+    allow read: if true;
+    allow list: if true;
+    allow create: if false;  
+    allow update: if false; 
+    allow delete: if false; 
+  }
+
   match /databases/{database}/documents/events/{event} {
     allow read: if false;
     allow create: if false;  
@@ -228,7 +237,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"];
+          let skipPaths = ["collection-data", "users", "staged-users", "events", "rule-helpers", "phone-auth", "public-users"];
           let ruleHelper = get(/databases/$(database)/documents/rule-helpers/$(request.auth.uid)).data;
           return !(collectionPath in skipPaths) &&
                  !(permissionCheck == "write" && 
@@ -303,4 +312,4 @@ service cloud.firestore {
       }
     }
   }
-  // #EDGE FIREBASE RULES END
+// #EDGE FIREBASE RULES END