@edgedev/firebase 2.1.66 → 2.1.68

package/edgeFirebase.ts

@@ -125,6 +125,7 @@ interface newUser {
   specialPermissions: specialPermission[];
   meta: object;
   isTemplate?: boolean;
+  customRegCode?: string;
   subCreate?: {
     rootPath: string, // This must be a collection path (odd number of segments) since a document will be created and assigned to ther user here.
     role: string,
@@ -728,27 +729,59 @@ export const EdgeFirebase = class {
           });
         }
         
-        let metaUpdate = {};
-        if (Object.prototype.hasOwnProperty.call(userRegister, 'meta')) {
-          metaUpdate = userRegister.meta;
-        }else{
-          metaUpdate = user.meta;
-        }
-        let stagedUserUpdate: {userId?: string, templateUserId?: string, dynamicDocumentFieldValue?: string, uid: string, meta: unknown, templateMeta?: unknown, requestedOrgId?: unknown} = {userId: response.user.uid, uid: response.user.uid, meta: metaUpdate}
+        // Build Firestore dotted-path updates so meta merges instead of replacing
+        const incomingMeta =
+          (Object.prototype.hasOwnProperty.call(userRegister, 'meta') &&
+          userRegister.meta && typeof userRegister.meta === 'object')
+            ? (userRegister.meta as any)
+            : {};
+
+        // Identity fields written at top level
+        let stagedUserUpdate: {
+          userId?: string;
+          templateUserId?: string;
+          dynamicDocumentFieldValue?: string;
+          uid: string;
+          requestedOrgId?: string;
+        } = {
+          userId: response.user.uid,
+          uid: response.user.uid
+        };
+
+        let dottedUpdates: Record<string, any> = {};
+
         if (user.isTemplate) {
-          stagedUserUpdate = {templateUserId: response.user.uid, uid: response.user.uid, meta: user.meta, templateMeta: metaUpdate}
+          // Template flow: keep template `meta` intact; write user fields as templateMeta.*
+          stagedUserUpdate = { templateUserId: response.user.uid, uid: response.user.uid };
+
           if (Object.prototype.hasOwnProperty.call(userRegister, 'dynamicDocumentFieldValue')) {
-            stagedUserUpdate = {templateUserId: response.user.uid, uid: response.user.uid, dynamicDocumentFieldValue: userRegister.dynamicDocumentFieldValue, meta: user.meta, templateMeta: metaUpdate}
+            stagedUserUpdate.dynamicDocumentFieldValue = userRegister.dynamicDocumentFieldValue;
+          }
+          if (Object.prototype.hasOwnProperty.call(userRegister, 'requestedOrgId')) {
+            stagedUserUpdate.requestedOrgId = userRegister.requestedOrgId?.toLowerCase();
           }
+
+          // Only write templateMeta.* dotted paths (do not touch meta)
+          dottedUpdates = { ...this.flattenObjectPaths(incomingMeta, 'templateMeta') };
+        } else {
+          // Non-template: merge user meta into existing meta using dotted paths
           if (Object.prototype.hasOwnProperty.call(userRegister, 'requestedOrgId')) {
-            stagedUserUpdate = {templateUserId: response.user.uid, uid: response.user.uid, dynamicDocumentFieldValue: userRegister.dynamicDocumentFieldValue, meta: user.meta, templateMeta: metaUpdate, requestedOrgId: userRegister.requestedOrgId.toLowerCase()}
+            stagedUserUpdate.requestedOrgId = userRegister.requestedOrgId?.toLowerCase();
           }
+          dottedUpdates = { ...this.flattenObjectPaths(incomingMeta, 'meta') };
         }
-        const initRoleHelper = {uid: response.user.uid}
-        initRoleHelper["edge-assignment-helper"] = {permissionType: "roles"}
+
+        const initRoleHelper: any = { uid: response.user.uid };
+        initRoleHelper["edge-assignment-helper"] = { permissionType: "roles" };
         this.user.loggingIn = true;
         await setDoc(doc(this.db, "rule-helpers", response.user.uid), initRoleHelper);
-        await updateDoc(doc(this.db, "staged-users/" + userRegister.registrationCode), stagedUserUpdate)
+
+        // Firestore merges only the specified dotted fields inside meta/templateMeta.
+        await updateDoc(
+          doc(this.db, "staged-users/" + userRegister.registrationCode),
+          { ...stagedUserUpdate, ...dottedUpdates }
+        );
+
         this.logAnalyticsEvent("sign_up", { uid: response.user.uid});
         return this.sendResponse({
           success: true,
@@ -1023,6 +1056,29 @@ export const EdgeFirebase = class {
     return response;
   };
 
+  private flattenObjectPaths = (obj: any, base: string): Record<string, any> => {
+    const out: Record<string, any> = {};
+    const walk = (cur: any, prefix: string) => {
+      if (cur === null || cur === undefined) {
+        out[prefix] = cur;
+        return;
+      }
+      if (typeof cur !== 'object' || Array.isArray(cur)) {
+        out[prefix] = cur;
+        return;
+      }
+      for (const [k, v] of Object.entries(cur)) {
+        walk(v, `${prefix}.${k}`);
+      }
+    };
+    if (obj && typeof obj === 'object') {
+      for (const [k, v] of Object.entries(obj)) {
+        walk(v, `${base}.${k}`);
+      }
+    }
+    return out;
+  }
+
   private setRuleHelper = async(collectionPath: string, action): Promise<void> => {
     const collection = collectionPath.replaceAll("-", "/").split("/");
     let ruleKey = collectionPath.replaceAll("/", "-");
@@ -1150,8 +1206,10 @@ export const EdgeFirebase = class {
   private generateUserMeta = async (userMeta: newUser): Promise<actionResponse> => {
     const roles: role[] = userMeta.roles || [];
     const specialPermissions: specialPermission[] = userMeta.specialPermissions || [];
+    const docId = userMeta?.customRegCode || "";
     delete userMeta.roles;
     delete userMeta.specialPermissions;
+    delete userMeta.customRegCode;
 
     let isTemplate = false
     if (Object.prototype.hasOwnProperty.call(userMeta, "isTemplate") && userMeta.isTemplate) {
@@ -1180,8 +1238,13 @@ export const EdgeFirebase = class {
     }
 
     const onlyMeta = { meta: userMeta.meta, userId:  "", uid: this.user.uid, roles:{}, specialPermissions:{}, isTemplate, subCreate, templateUserId: "" };
-
-    const docRef =  await addDoc(collection(this.db, "staged-users"), onlyMeta );
+    let docRef; 
+    if (!docId) {
+      docRef =  await addDoc(collection(this.db, "staged-users"), onlyMeta );
+    } else {
+      docRef =  doc(this.db, "staged-users", docId);
+      await setDoc(docRef, onlyMeta);
+    }
     for (const role of roles) {
       await this.storeUserRoles(docRef.id, role.collectionPath, role.role);
     }

package/package.json

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