@edgedev/firebase 1.4.9 → 1.5.2

package/README.md

@@ -249,12 +249,24 @@ edgeFirebase.removeUser("user@edgemarketingdesign.com");
 
 
 
-### List Users
+### Users Snapshot Data
 
-This will list all users that are members of the collection and subcollections passed to the function that the user running the function has assign access for, it will be a listed index by  email/user id.
+This will create a reactive object (users) that contains the members of the collection and subcollections passed to the snapshot that the user running the function has assign access for, it will be a listed index by  email/user id.  Passing no collection will get all users that the user running has assign access for.
 
 ```javascript
-const users = await edgeFirebase.listUsers("myItems");
+edgeFirebase.startUsersSnapshot("myItems");
+// Stop users snapshot:
+edgeFirebase.stopUsersSnapshot();
+```
+
+```vue
+<template>
+  <div>
+    <div v-for="user in edgeFirebase.users" :key="item">
+      {{ user.email }}
+    </div>
+  </div>
+</template>
 ```
 
 ```typescript

package/edgeFirebase.ts

@@ -1,5 +1,5 @@
 import { initializeApp } from "firebase/app";
-import { reactive } from "vue";
+import { reactive, computed } from "vue";
 import {
   getFirestore,
   collection,
@@ -213,6 +213,7 @@ export const EdgeFirebase = class {
       this.user.specialPermissions = specialPermissions;
       await this.listCollectionsCanAssign()
     }
+    this.stopSnapshot('userMeta')
     const metaUnsubscribe = onSnapshot(
       doc(this.db, "users", this.user.email),
       (doc) => {
@@ -733,6 +734,63 @@ export const EdgeFirebase = class {
 
   // Simple Store Items (add matching key per firebase collection)
   public data: CollectionDataObject = reactive({});
+  private usersByCollections: CollectionDataObject = reactive({});
+
+  public users = computed(() => {
+    const userList = {};
+    const keys = Object.keys(JSON.parse(JSON.stringify(this.usersByCollections)));
+    keys.forEach(key => {
+      const users = this.usersByCollections[key];
+      if (key.startsWith("ROLES|")) {
+        const collectionPathCheck = key.replace("ROLES|", "")
+        const userKeys = Object.keys(users);
+        if (Object.keys(users).length > 0) {
+          userKeys.forEach(userKey => {
+            const user = users[userKey];
+            if (!Object.prototype.hasOwnProperty.call(userList, user.docId)) {
+              userList[user.email] = {
+                docId: user.docId,
+                email: user.email,
+                roles: [{collectionPath: collectionPathCheck, role: user.roles[collectionPathCheck].role }],
+                specialPermissions: [],
+                meta: user.meta,
+                last_updated: user.last_updated,
+                userId: user.userId,
+                uid: user.uid
+              }
+            } else {
+              userList[user.email].roles.push({ collectionPath: collectionPathCheck, role: user.roles[collectionPathCheck].role }) 
+            }
+          });
+        }
+      }
+      if (key.startsWith("SPECIALPERMISSIONS|")) {
+        const collectionPathCheck = key.replace("SPECIALPERMISSIONS|", "")
+        const userKeys = Object.keys(users);
+        if (Object.keys(users).length > 0) {
+          userKeys.forEach(userKey => {
+            const user = users[userKey];
+            if (!Object.prototype.hasOwnProperty.call(userList, user.docId)) {
+              userList[user.email] = {
+                docId: user.docId,
+                email: user.email,
+                roles: [],
+                specialPermissions: [{ collectionPath: collectionPathCheck, permissions: user.specialPermissions[collectionPathCheck].permissions }],
+                meta: user.meta,
+                last_updated: user.last_updated,
+                userId: user.userId,
+                uid: user.uid
+              }
+            } else {
+              userList[user.email].specialPermissions.push({ collectionPath: collectionPathCheck, permissions: user.specialPermissions[collectionPathCheck].permissions }) 
+            }
+          });
+        }
+      }
+    });
+    return userList;
+  });
+
   public unsubscibe: CollectionUnsubscribeObject = reactive({});
   public user: UserDataObject = reactive({
     uid: null,
@@ -993,6 +1051,7 @@ export const EdgeFirebase = class {
   ): Promise<actionResponse> => {
     const canRead = await this.permissionCheck("read", collectionPath);
     this.data[collectionPath] = {};
+    this.stopSnapshot(collectionPath);
     this.unsubscibe[collectionPath] = null;
     if (canRead) {
       const q = this.getQuery(collectionPath, queryList, orderList, max);
@@ -1067,70 +1126,78 @@ export const EdgeFirebase = class {
     this.user.canAssignCollectionPaths = collectionPathList;
   };
 
-  public listUsers = async (collectionPath = ''): Promise<usersByEmail> => {
-    const userList = {};
+  public stopUsersSnapshot = (): void => {
+    const keys = Object.keys(this.usersByCollections).filter((key) => key.startsWith('ROLES|') || key.startsWith('SPECIALPERMISSIONS|'));
+    keys.forEach((key) => {
+      this.stopSnapshot(key);
+    });
+  }
 
+  public startUsersSnapshot = async(collectionPath = ''): Promise<void> => {
+    this.stopUsersSnapshot();
     for (const collectionPathCheck of this.user.canAssignCollectionPaths) {
-
+      
       if (collectionPathCheck.startsWith(collectionPath.replaceAll('/', '-'))) {
-        const roleUsers = await getDocs(
-          query(
-            collection(this.db, "users"),
-            where(
-              "roles." + collectionPathCheck + ".collectionPath",
-              "==",
-              collectionPathCheck
-            )
+        this.usersByCollections['ROLES|' + collectionPathCheck] = {};
+        let q = query(
+          collection(this.db, "users"),
+          where(
+            "roles." + collectionPathCheck + ".collectionPath",
+            "==",
+            collectionPathCheck
           )
-        );
-            
-        roleUsers.forEach((doc) => {
-          const user = doc.data();
-          if (!Object.prototype.hasOwnProperty.call(userList, user.docId)) {
-            userList[user.email] = {
+        )
+        const rolesUnsubscribe = await onSnapshot(q, (querySnapshot) => {
+          const items = {};
+          querySnapshot.forEach((doc) => {
+            const user = doc.data();
+            const item = {
               docId: user.docId,
               email: user.email,
-              roles: [{collectionPath: collectionPathCheck, role: user.roles[collectionPathCheck].role }],
+              roles: user.roles,
               specialPermissions: [],
               meta: user.meta,
               last_updated: user.last_updated,
               userId: user.userId,
               uid: user.uid
             }
-          } else {
-            userList[user.email].roles.push({ collectionPath: collectionPathCheck, role: user.roles[collectionPathCheck].role }) 
-          }
+            items[doc.id] = item;
+          });
+          this.usersByCollections['ROLES|' + collectionPathCheck] = items;
         });
-        const specialPermissionsUsers = await getDocs(
-          query(
-            collection(this.db, "users"),
-            where(
-              "specialPermissions." + collectionPathCheck + ".collectionPath",
-              "==",
-              collectionPathCheck
-            )
+        this.unsubscibe['ROLES|' + collectionPathCheck] = rolesUnsubscribe
+
+        this.usersByCollections['SPECIALPERMISSIONS|' + collectionPathCheck] = {};
+        q = query(
+          collection(this.db, "users"),
+          where(
+            "specialPermissions." + collectionPathCheck + ".collectionPath",
+            "==",
+            collectionPathCheck
           )
-        );
-        specialPermissionsUsers.forEach((doc) => {
-          const user = doc.data();
-          if (!Object.prototype.hasOwnProperty.call(userList, user.docId)) {
-            userList[user.email] = {
+        )
+
+        const specialPermissionsunsubscribe = await onSnapshot(q, (querySnapshot) => {
+          const items = {};
+          querySnapshot.forEach((doc) => {
+            const user = doc.data();
+            const item = {
               docId: user.docId,
               email: user.email,
-              role: [],
-              specialPermissions: [{ collectionPath: collectionPathCheck, permissions: user.specialPermissions[collectionPathCheck].permissions }],
+              roles: [],
+              specialPermissions: user.specialPermissions,
               meta: user.meta,
               last_updated: user.last_updated,
               userId: user.userId,
               uid: user.uid
             }
-          } else {
-          userList[user.email].specialPermissions.push({ collectionPath: collectionPathCheck, permissions: user.specialPermissions[collectionPathCheck].permissions })
-          }
+            items[doc.id] = item;
+          });
+          this.usersByCollections['SPECIALPERMISSIONS|' + collectionPathCheck] = items;
         });
+        this.unsubscibe['SPECIALPERMISSIONS|' + collectionPathCheck] = specialPermissionsunsubscribe;
       }
     }
-    return userList;
   };
 
   public removeUserRoles = async (

package/package.json

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