backend-manager 2.5.59 → 2.5.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.59",
+  "version": "2.5.61",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "@google-cloud/storage": "^5.20.5",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
-    "backend-assistant": "^0.0.74",
+    "backend-assistant": "^1.0.0",
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
@@ -62,4 +62,4 @@
     "wonderful-fetch": "^0.0.17",
     "yargs": "^17.7.1"
   }
-}
+}

package/src/manager/helpers/utilities.js

@@ -4,7 +4,6 @@ function Utilities(Manager) {
   const self = this;
 
   self.cache = null;
-  self._deleteThis = Math.random();
   
   self.Manager = Manager;
 }
@@ -157,50 +156,6 @@ Utilities.prototype.randomId = function (options) {
   return nanoId();
 };
 
-// Utilities.prototype.get = function (doc, options) {
-//   const self = this;
-
-//   return new Promise(function(resolve, reject) {
-
-//     options = options || {};
-//     options.maxAge = options.maxAge || (1000 * 60 * 5); // 5 minutes
-
-//     self.cache = self.cache || self.Manager.storage({name: 'cache', temporary: true, clear: false});
-
-//     const item = self.cache.get(doc).value();
-//     const age = item ? Date.now() - item.time : null;
-
-//     console.log('+++++ 111', doc, age, item);
-
-//     if (item && age < options.maxAge) {
-//       console.log('---GOT FROM CACHE---');
-      
-//       return resolve(self.cache.map.get(doc).data);
-//     } else {
-//       console.log('---GOT FROM FIRESTORE---');
-      
-//       self.Manager.libraries.admin.firestore().doc(doc)
-//         .get()
-//         .then(async (doc) => {
-//           const data = doc.data();
-
-//           if (!data) {
-//             throw new Error(`Document with ID ${doc} not found`);
-//           }
-
-//           self.cache.set(doc, {
-//             data: data,
-//             time: Date.now(),
-//           })
-//           .write();
-
-//           return resolve(data);
-//         })
-//     }
-//   });
-// };
-
-
 Utilities.prototype.get = function (docPath, options) {
   const self = this;
 

package/templates/firestore.rules

@@ -1,27 +1,29 @@
 rules_version = '2';
 service cloud.firestore {
   match /databases/{database}/documents {
+    // Custom rules
+    // ...
 
+    ///---default-rules---///
     // Lock by default
     match /{document=**} {
       allow read, write: if isAdmin();
     }
-
-    // Custom rules
-    ///---default-rules---///
+        
+    // Protect user account data
     match /users/{uid} {
       allow read: if belongsTo(uid);
-      allow write: if ((belongsTo(uid) && !isWritingProtectedUserField()));
-      // might also want to include a check for email verified?
+      allow write: if belongsTo(uid) && !isWritingProtectedUserField();
     }
+
+    // Protect notification data
     match /notifications/subscriptions/all/{token} {
-      allow read: if (existingData().token == token) || belongsTo(existingData().link.user.pk);
-      allow update: if (existingData().token == token);
+      allow read: if existingData().token == token || belongsTo(existingData().link.user.pk);
+      allow update: if existingData().token == token;
       allow create: if true;
     }
     ///---------end---------///
 
-
     ///---backend-manager---///
     ///---version=0.0.0---///
     // Basic rules
@@ -34,10 +36,10 @@ service cloud.firestore {
       return request.auth.uid;
     }
     function isAuthenticated() {
-      return request.auth.uid != null;
+      return request.auth != null;
     }
     function belongsTo(identity) {
-      return (isAuthenticated() && (authUid() == identity || authEmail() == identity));
+      return isAuthenticated() && (authUid() == identity || authEmail() == identity);
       // eventually include a check for (existingData().link.email == identity)...(in case its a doc owned by a user that's not actually user doc)
     }
 
@@ -58,13 +60,12 @@ service cloud.firestore {
 
     function isWritingProtectedUserField() {
       return isWritingField('auth')
-      		|| isWritingField('roles')
-          || isWritingField('plan')
-          || isWritingField('affiliate')
-          || isWritingField('api')
-          || isWritingField('link')
-          || isWritingField('usage')
-          || isWritingField('view');
+        || isWritingField('roles')
+        || isWritingField('plan')
+        || isWritingField('affiliate')
+        || isWritingField('api')
+        || isWritingField('link')
+        || isWritingField('usage');
     }
 
     function isCreatingField(field) {