@edgedev/firebase 2.0.5 → 2.0.7

package/edgeFirebase.ts

@@ -400,9 +400,14 @@ export const EdgeFirebase = class {
     this.unsubscibe['collection-data'] = unsubscribe
   }
 
-
+  private ruleHelperReset = async (): Promise<void> => {
+    const initRoleHelper = { uid: this.user.uid, 'edge-assignment-helper': {permissionType: "roles"} }
+    this.state.ruleHelpers['edge-assignment-helper'] = {permissionType: "roles"}
+    await setDoc(doc(this.db, "rule-helpers", this.user.uid), initRoleHelper);
+  }
 
   private startUserMetaSync = async (docSnap): Promise<void> => {
+    await this.ruleHelperReset();
     await this.startCollectionPermissionsSync()
     await this.initUserMetaPermissions(docSnap);
     this.user.loggedIn = true;
@@ -977,7 +982,12 @@ export const EdgeFirebase = class {
     }
     let index = collection.length;
     const ruleCheck: RuleCheck =  { permissionType: "", permissionCheckPath: "", fullPath: collectionPath.replaceAll("/", "-"), action };
-   
+    if (this.state.ruleHelpers[ruleKey]) {
+      const existingRuleHelper = this.state.ruleHelpers[ruleKey];
+      if (existingRuleHelper.fullPath === ruleCheck.fullPath && existingRuleHelper.action === ruleCheck.action) {
+        return;
+      }
+    }
     while (index > 0) {
       const collectionArray = JSON.parse(JSON.stringify(collection));
       const permissionCheck = collectionArray.splice(0, index).join("-");
@@ -1017,6 +1027,7 @@ export const EdgeFirebase = class {
     }
     const check = {[ruleKey]: ruleCheck,  uid: this.user.uid };
     await setDoc(doc(this.db, "rule-helpers", this.user.uid), check, { merge: true });
+    this.state.ruleHelpers[ruleKey] = ruleCheck;
   }
 
   public permissionCheckOnly = (action: action, collectionPath: string): boolean => {
@@ -1240,6 +1251,7 @@ export const EdgeFirebase = class {
     users: {},
     registrationCode: "",
     registrationMeta: {},
+    ruleHelpers: {},
   });
 
   public getDocData = async (

package/package.json

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

package/src/edgeFirebase.js

@@ -1,3 +1,7 @@
+// TODO: THE permissionCheck will call a cloud function that will check the user's permissions also...
+// This could function will right to "rules-helpers" collction a document with the user's uid and the collection path and the permission
+// This will make the rules far more efficient and will allow for more complex rules // this only needs done really for snapshots... 
+// All the other document reads and writes should be made using a cloud functions exclusively and the cloud function will check the permissions
 const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db } = require('./config.js')
 
 const authToken = process.env.TWILIO_AUTH_TOKEN
@@ -278,9 +282,9 @@ function setUser(userRef, newData, oldData, stagedDocId) {
     let userUpdate = { meta: newData.meta, stagedDocId }
 
     if (newData.meta && newData.meta.name) {
-      const publicUserRef = db.collection('public-users').doc(newData.userId)
+      const publicUserRef = db.collection('public-users').doc(newData.uid)
       const publicMeta = { name: newData.meta.name }
-      publicUserRef.set({ uid: newData.uid, meta: publicMeta, collectionPaths: newData.collectionPaths, userId: newData.userId })
+      publicUserRef.set({ uid: newData.uid, meta: publicMeta, collectionPaths: newData.collectionPaths, userId: newData.uid })
     }
 
     if (Object.prototype.hasOwnProperty.call(newData, 'roles')) {