@edgedev/firebase 1.8.11 → 1.8.12

package/edgeFirebase.ts

@@ -632,7 +632,7 @@ export const EdgeFirebase = class {
 
   public removeUser = async (docId: string): Promise<actionResponse> => {
     const removedFrom = [];
-    const userRef = doc(this.db, "users", docId);
+    const userRef = doc(this.db, "staged-users", docId);
     const userSnap = await getDoc(userRef);
     if (userSnap.data().roles) {
       for (const collectionPath in userSnap.data().roles) {
@@ -653,7 +653,7 @@ export const EdgeFirebase = class {
           collectionPath.replaceAll("-", "/")
         );
         if (canAssign) {
-          this.removeUserSpecialPermissions(
+         await this.removeUserSpecialPermissions(
             docId,
             collectionPath.replaceAll("-", "/")
           );
@@ -662,10 +662,11 @@ export const EdgeFirebase = class {
       }
     }
     if (removedFrom.length > 0) {
+      const response = await this.runFunction("removeNonRegisteredUser", {uid: this.user.uid, docId});
       return this.sendResponse({
         success: true,
         message: "",
-        meta: {}
+        meta: {response}
       });
     } else {
       return this.sendResponse({
@@ -892,8 +893,8 @@ export const EdgeFirebase = class {
   };
 
   private generateUserMeta = async (userMeta: newUser): Promise<actionResponse> => {
-    const roles: role[] = userMeta.roles;
-    const specialPermissions: specialPermission[] = userMeta.specialPermissions;
+    const roles: role[] = userMeta.roles || [];
+    const specialPermissions: specialPermission[] = userMeta.specialPermissions || [];
     delete userMeta.roles;
     delete userMeta.specialPermissions;
 
@@ -1411,6 +1412,7 @@ export const EdgeFirebase = class {
     }
     if (canAssign) {
       await updateDoc(doc(this.db, "staged-users/" + docId), {
+        uid: this.user.uid,
         collectionPaths: arrayRemove(collectionPath.replaceAll("/", "-")),
         ["roles." + collectionPath.replaceAll("/", "-")]: deleteField()
       });
@@ -1440,6 +1442,7 @@ export const EdgeFirebase = class {
     }
     if (canAssign) {
       await updateDoc(doc(this.db, "staged-users/" + docId), {
+        uid: this.user.uid,
         collectionPaths: arrayRemove(collectionPath.replaceAll("/", "-")),
         ["specialPermissions." + collectionPath.replaceAll("/", "-")]:
           deleteField()

package/package.json

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

package/src/firestore.rules

@@ -68,20 +68,27 @@ service cloud.firestore {
       let ruleHelper = get(/databases/$(database)/documents/rule-helpers/$(request.auth.uid)).data;
       
       return (
-              resource == null ||
-              request.resource.data.userId == resource.data.userId ||
+              request.auth.uid == request.resource.data.uid &&
               (
-                resource.data.userId == "" &&
                 (
-                  request.resource.data.userId == request.auth.uid ||
-                  request.resource.data.templateUserId == request.auth.uid
+                  (
+                     request.resource.data.userId == resource.data.userId ||
+                     resource.data.userId == ""
+                   ) &&
+                  (
+                    request.resource.data.userId == request.auth.uid ||
+                    request.resource.data.templateUserId == request.auth.uid
+                  )
+                ) ||
+                (
+                  request.resource.data.userId == resource.data.userId &&
+                  "edge-assignment-helper" in ruleHelper &&
+                  permissionUpdatesCheck(user, ruleHelper, "roles") && 
+                  permissionUpdatesCheck(user, ruleHelper, "specialPermssions")
                 )
               )
-             ) && 
-             "edge-assignment-helper" in ruleHelper &&
-             permissionUpdatesCheck(user, ruleHelper, "roles") && 
-             permissionUpdatesCheck(user, ruleHelper, "specialPermssions") && 
-             request.auth.uid == request.resource.data.uid;
+             );
+             
     }
 
 

package/src/functions.js

@@ -1,4 +1,39 @@
 // START @edge/firebase functions
+exports.removeNonRegisteredUser = functions.https.onCall(async (data, context) => {
+  if (data.uid === context.auth.uid) {
+    const stagedUser = await db.collection('staged-users').doc(data.docId).get()
+    if (stagedUser.exists) {
+      const stagedUserData = stagedUser.data()
+
+      const rolesExist = stagedUserData.roles && Object.keys(stagedUserData.roles).length !== 0
+      const specialPermissionsExist = stagedUserData.specialPermissions && Object.keys(stagedUserData.specialPermissions).length !== 0
+      const userIdExistsAndNotBlank = stagedUserData.userId && stagedUserData.userId !== ''
+
+      if (!rolesExist && !specialPermissionsExist && !userIdExistsAndNotBlank) {
+        await db.collection('staged-users').doc(data.docId).delete()
+        return { success: true, message: '' }
+      }
+      else {
+        let message = ''
+        if (rolesExist && specialPermissionsExist) {
+          message = 'Cannot delete because the non-registered user still has roles and special permissions assigned.'
+        }
+        else if (rolesExist) {
+          message = 'Cannot delete because the non-registered user still has roles assigned.'
+        }
+        else if (specialPermissionsExist) {
+          message = 'Cannot delete because the non-registered user still has special permissions assigned.'
+        }
+        else if (userIdExistsAndNotBlank) {
+          message = 'Cannot delete because the user is registered.'
+        }
+        return { success: false, message }
+      }
+    }
+  }
+  return { success: false, message: 'Non-registered user not found.' }
+})
+
 exports.updateUser = functions.firestore.document('staged-users/{docId}').onUpdate((change, context) => {
   const eventId = context.eventId
   const eventRef = db.collection('events').doc(eventId)