@edgedev/firebase 2.1.67 → 2.1.70

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,
@@ -913,11 +914,11 @@ export const EdgeFirebase = class {
     if (!stagedDocId) {
       stagedDocId = this.user.stagedDocId;
     }
+    const updates: Record<string, unknown> = { uid: this.user.uid };
     for (const [key, value] of Object.entries(meta)) {
-      await updateDoc(doc(this.db, "staged-users/" + stagedDocId), {
-        ["meta." + key]: value, uid: this.user.uid
-      });
+      updates[`meta.${key}`] = value;
     }
+    await updateDoc(doc(this.db, "staged-users/" + stagedDocId), updates);
     return this.sendResponse({
       success: true,
       message: "line 664",
@@ -1205,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) {
@@ -1235,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);
     }
@@ -2395,4 +2403,4 @@ export const EdgeFirebase = class {
       });
     }
   }
-};
+};

package/package.json

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

package/src/edgeFirebase.js

@@ -2,7 +2,7 @@ const AWS = require('aws-sdk')
 const FormData = require('form-data')
 const fetch = require('node-fetch')
 
-const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db, onSchedule, onDocumentUpdated, pubsub, Storage, permissionCheck, onObjectFinalized, onObjectDeleted, onDocumentDeleted } = require('./config.js')
+const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db, onSchedule, onDocumentUpdated, onDocumentWritten, pubsub, Storage, permissionCheck, onObjectFinalized, onObjectDeleted, onDocumentDeleted } = require('./config.js')
 const authToken = process.env.TWILIO_AUTH_TOKEN
 const accountSid = process.env.TWILIO_SID
 const systemNumber = process.env.TWILIO_SYSTEM_NUMBER
@@ -302,6 +302,35 @@ exports.topicQueue = onSchedule({ schedule: 'every 1 minutes', timeoutSeconds: 1
   }
 })
 
+exports.userSyncMetaToOrg = onDocumentWritten({ document: 'staged-users/{stagedId}', timeoutSeconds: 180 }, async (event) => {
+  console.log('userSyncMetaToOrg triggered')
+  const change = event.data
+  const afterExists = change.after.exists
+  const beforeData = change.before.data() || {}
+  const afterData = afterExists ? change.after.data() : null
+
+  const beforeUniqueOrgs = beforeData.roles ? [...new Set(Object.values(beforeData.roles).map(role => role.collectionPath.split('-')[1]))] : []
+  const afterUniqueOrgs = (afterData && afterData.roles) ? [...new Set(Object.values(afterData.roles).map(role => role.collectionPath.split('-')[1]))] : []
+  if (!afterExists) {
+    for (const orgId of beforeUniqueOrgs) {
+      // delete user from org
+      const orgRef = db.collection('organizations').doc(orgId).collection('users').doc(change.before.id)
+      await orgRef.delete()
+    }
+  }
+  const orgsRemoved = beforeUniqueOrgs.filter(orgId => !afterUniqueOrgs.includes(orgId))
+  for (const orgId of orgsRemoved) {
+    // delete user from org
+    const orgRef = db.collection('organizations').doc(orgId).collection('users').doc(change.before.id)
+    await orgRef.delete()
+  }
+  for (const orgId of afterUniqueOrgs) {
+    // add user to org
+    const orgRef = db.collection('organizations').doc(orgId).collection('users').doc(change.before.id)
+    await orgRef.set({ ...afterData.meta, userId: afterData.userId, stagedDocId: change.before.id })
+  }
+})
+
 exports.sendVerificationCode = onCall(async (request) => {
   const data = request.data
   let code = (Math.floor(Math.random() * 1000000) + 1000000).toString().substring(1)