@edgedev/firebase 1.4.1 → 1.4.3

package/README.md

@@ -242,23 +242,23 @@ edgeFirebase.removeUser("user@edgemarketingdesign.com");
 
 ### List Users
 
-This will list all users that are members of collections that the user running the function has assign access for, it will list them grouped by collections.
+This will list all users that are members of collections that the user running the function has assign access for, it will be a listed index by  email/user id.
 
 ```javascript
 const users = await edgeFirebase.listUsers();
 ```
 
 ```typescript
-interface usersByCollection {
-  [collectionPath: string]: [user];
+interface usersByEmail {
+  [email: string]: [user];
 }
 ```
 
 ```typescript
 interface user {
   email: string;
-  role: "admin" | "user" | null;
-  specialPermission: permissions | null;
+  roles: role[];
+  specialPermissions: specialPermission[];
   userId: string;
   docId: string;
   uid: string;
@@ -266,6 +266,29 @@ interface user {
 }
 ```
 
+```typescript
+interface role {
+  collectionPath: "-" | string; // - is root
+  role: "admin" | "user";
+}
+```
+
+```typescript
+interface specialPermission {
+  collectionPath: "-" | string; // - is root
+  permissions: permissions;
+}
+```
+
+```typescript
+interface permissions {
+  assign: boolean;
+  read: boolean;
+  write: boolean;
+  delete: boolean;
+}
+```
+
 
 
 ### List Collections with Assign Access

package/edgeFirebase.ts

@@ -103,16 +103,16 @@ interface newUser {
 
 interface user {
   email: string;
-  role: "admin" | "user" | null;
-  specialPermission: permissions | null;
+  roles: role[];
+  specialPermissions: specialPermission[];
   userId: string;
   docId: string;
   uid: string;
   last_updated: Date;
 }
 
-interface usersByCollection {
-  [collectionPath: string]: [user];
+interface usersByEmail {
+  [email: string]: [user];
 }
 interface userMeta extends newUser {
   docId: string;
@@ -438,19 +438,28 @@ export const EdgeFirebase = class {
       newUser.specialPermissions
     );
     if (canAssignRole.canDo && canAssignSpecialPermissions.canDo) {
-      const userMeta: userMeta = {
-        docId: newUser.email,
-        userId: "",
-        email: newUser.email,
-        roles: newUser.roles,
-        specialPermissions: newUser.specialPermissions,
-        meta: newUser.meta
-      };
-      this.generateUserMeta(userMeta);
-      return this.sendResponse({
-        success: true,
-        message: ""
-      });
+      const userRef = doc(this.db, "users", newUser.email);
+      const userSnap = await getDoc(userRef);
+      if (!userSnap.exists()) {
+        const userMeta: userMeta = {
+          docId: newUser.email,
+          userId: "",
+          email: newUser.email,
+          roles: newUser.roles,
+          specialPermissions: newUser.specialPermissions,
+          meta: newUser.meta
+        };
+        this.generateUserMeta(userMeta);
+        return this.sendResponse({
+          success: true,
+          message: ""
+        });
+      } else {
+        return this.sendResponse({
+          success: false,
+          message: "User already exists"
+        });
+      }
     } else {
       return this.sendResponse({
         success: false,
@@ -988,6 +997,7 @@ export const EdgeFirebase = class {
     }
   };
 
+  // TODO: change this function to be synced dynamically on the user object
   public listCollectionsCanAssign = async (): Promise<string[]> => {
     let collectionPaths = [];
     for (const role of this.user.roles) {
@@ -1035,11 +1045,18 @@ export const EdgeFirebase = class {
     return collectionPathList;
   };
 
-  public listUsers = async (): Promise<usersByCollection> => {
+  // TODO: finish making this query by collectionPath if passed.. in furture will be used to get users by collectionPath
+  // because having one giant list of users is not scalable
+  public listUsers = async (collectionPath = ''): Promise<usersByEmail> => {
     const userList = {};
+    if (collectionPath) {
+      const canAssign = await this.permissionCheck("assign", collectionPath);
+      if (!canAssign) {
+        return {}
+      }
+    }
     const collectionPathList = await this.listCollectionsCanAssign();
     for (const collectionPath of collectionPathList) {
-      userList[collectionPath] = [];
       const roleUsers = await getDocs(
         query(
           collection(this.db, "users"),
@@ -1052,16 +1069,20 @@ export const EdgeFirebase = class {
       );
       roleUsers.forEach((doc) => {
         const user = doc.data();
-        userList[collectionPath].push({
-          docId: user.docId,
-          email: user.email,
-          role: user.roles[collectionPath].role,
-          specialPermission: null,
-          meta: user.meta,
-          last_updated: user.last_updated,
-          userId: user.userId,
-          uid: user.uid
-        });
+        if (!Object.prototype.hasOwnProperty.call(userList, user.docId)) {
+          userList[user.email] = {
+            docId: user.docId,
+            email: user.email,
+            roles: [{collectionPath, role: user.roles[collectionPath].role }],
+            specialPermissions: [],
+            meta: user.meta,
+            last_updated: user.last_updated,
+            userId: user.userId,
+            uid: user.uid
+          }
+        } else {
+          userList[user.email].roles.push({ collectionPath, role: user.roles[collectionPath].role }) 
+        }
       });
       const specialPermissionsUsers = await getDocs(
         query(
@@ -1075,17 +1096,20 @@ export const EdgeFirebase = class {
       );
       specialPermissionsUsers.forEach((doc) => {
         const user = doc.data();
-        userList[collectionPath].push({
-          docId: user.docId,
-          email: user.email,
-          role: null,
-          specialPermission:
-            user.specialPermissions[collectionPath].permissions,
-          meta: user.meta,
-          last_updated: user.last_updated,
-          userId: user.userId,
-          uid: user.uid
-        });
+        if (!Object.prototype.hasOwnProperty.call(userList, user.docId)) {
+          userList[user.email] = {
+            docId: user.docId,
+            email: user.email,
+            role: [],
+            specialPermissions: [{ collectionPath, permissions: user.specialPermissions[collectionPath].permissions }],
+            meta: user.meta,
+            last_updated: user.last_updated,
+            userId: user.userId,
+            uid: user.uid
+          }
+        } else {
+         userList[user.email].specialPermissions.push({ collectionPath, permissions: user.specialPermissions[collectionPath].permissions })
+        }
       });
     }
     return userList;
@@ -1171,7 +1195,7 @@ export const EdgeFirebase = class {
     }
   };
 
-  public storeUserRoles = async (
+  private storeUserRoles = async (
     email: string,
     collectionPath: string,
     role: "admin" | "user"

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@edgedev/firebase",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Vue 3 / Nuxt 3 Plugin or Nuxt 3 global composable for firebase authentication and firestore.",
   "main": "index.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
   "author": "Seth Fischer",
   "keywords": [
     "firebase authentication",
@@ -32,8 +35,5 @@
   "peerDependencies": {
     "firebase": "^9.12.1",
     "vue": "^3.0.0"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
   }
-}
+}