backend-manager 2.5.60 → 2.5.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.60",
+  "version": "2.5.62",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/functions/core/actions/api/user/sign-out-all-sessions.js

@@ -60,14 +60,29 @@ Module.prototype.signOutOfSession = function (uid, session) {
     .then(async (snap) => {
       const data = snap.val() || {};
       const keys = Object.keys(data);
+
       for (var i = 0; i < keys.length; i++) {
         const key = keys[i];
+
         self.assistant.log(`Signing out: ${key}`, {environment: 'production'});
-        await self.libraries.admin.database().ref(`${session}/${key}/command`).set('signout').catch(e => self.assistant.error(`Failed to signout ${key}`, e))
+        
+        // Send signout command
+        await self.libraries.admin.database().ref(`${session}/${key}/command`)
+          .set('signout')
+          .catch(e => self.assistant.error(`Failed to signout of session ${key}`, e))
+
         // await powertools.wait(3000);
-        // await self.libraries.admin.database().ref(`${session}/${key}`).remove().catch(e => self.assistant.error(`Failed to delete ${key}`, e))
+
+        // Delete session
+        setTimeout(function () {
+          self.libraries.admin.database().ref(`${session}/${key}`)
+            .remove()
+            .catch(e => self.assistant.error(`Failed to delete session ${key}`, e))          
+        }, 30000);
+
         count++;
       }
+
       return resolve(count);
     })
     .catch(e => {

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) {