backend-manager 2.2.4 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.2.4",
+  "version": "2.3.2",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -27,17 +27,17 @@
   },
   "homepage": "https://itwcreativeworks.com",
   "dependencies": {
-    "@firebase/rules-unit-testing": "^2.0.2",
+    "@firebase/rules-unit-testing": "^2.0.3",
     "@google-cloud/storage": "^5.20.5",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
-    "backend-assistant": "^0.0.64",
+    "backend-assistant": "^0.0.66",
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
     "dotenv": "^16.0.1",
     "firebase-admin": "^9.12.0",
-    "firebase-functions": "^3.21.2",
+    "firebase-functions": "^3.22.0",
     "fs-jetpack": "^4.3.1",
     "hcaptcha": "^0.1.1",
     "inquirer": "^8.2.4",
@@ -48,9 +48,9 @@
     "mocha": "^9.2.2",
     "moment": "^2.29.3",
     "node-fetch": "^2.6.7",
-    "node-powertools": "^0.0.13",
+    "node-powertools": "^0.0.14",
     "npm-api": "^1.0.1",
-    "paypal-server-api": "^0.0.6",
+    "paypal-server-api": "^0.0.7",
     "pushid": "^1.0.0",
     "semver": "^7.3.7",
     "shortid": "^2.2.16",

package/src/cli/cli.js

@@ -43,9 +43,9 @@ const fetch = require('node-fetch');
 
 let bem_giRegex = 'Set in .setup()'
 let bem_giRegexOuter = /# BEM>>>(.*\n?)# <<<BEM/sg;
-let bem_fsRulesRegex = /(\/\/\/---backend-manager---\/\/\/)(.*?)(\/\/\/---------end---------\/\/\/)/sgm;
-let bem_fsRulesDefaultRegex = /(\/\/\/---default-rules---\/\/\/)(.*?)(\/\/\/---------end---------\/\/\/)/sgm;
-let bem_fsRulesBackupRegex = /({{\s*?backend-manager\s*?}})/sgm;
+let bem_allRulesRegex = /(\/\/\/---backend-manager---\/\/\/)(.*?)(\/\/\/---------end---------\/\/\/)/sgm;
+let bem_allRulesDefaultRegex = /(\/\/\/---default-rules---\/\/\/)(.*?)(\/\/\/---------end---------\/\/\/)/sgm;
+let bem_allRulesBackupRegex = /({{\s*?backend-manager\s*?}})/sgm;
 let MOCHA_PKG_SCRIPT = 'mocha ../test/ --recursive --timeout=10000';
 let NPM_CLEAN_SCRIPT = 'rm -fr node_modules && rm -fr package-lock.json && npm cache clean --force && npm install && npm rb';
 let NOFIX_TEXT = chalk.red(`There is no automatic fix for this check.`);
@@ -139,7 +139,7 @@ Main.prototype.process = async function (args) {
 
   if (self.options['rules:default'] || self.options['rules:getdefault']) {
     self.getRulesFile();
-    console.log(self.default.firestoreRulesWhole.match(bem_fsRulesDefaultRegex)[0].replace('    ///', '///'));
+    console.log(self.default.firestoreRulesWhole.match(bem_allRulesDefaultRegex)[0].replace('    ///', '///'));
     return;
   }
 
@@ -205,9 +205,11 @@ module.exports = Main;
 
 Main.prototype.getRulesFile = function () {
   const self = this;
-  self.default.firestoreRulesWhole = (jetpack.read(path.resolve(`${__dirname}/../../templates/firestore.rules`))).replace('=0.0.0-', `-${self.default.version}-`);
-  self.default.firestoreRulesCore = self.default.firestoreRulesWhole.match(bem_fsRulesRegex)[0];
+  self.default.firestoreRulesWhole = (jetpack.read(path.resolve(`${__dirname}/../../templates/firestore.rules`))).replace('=0.0.0-', `=${self.default.version}-`);
+  self.default.firestoreRulesCore = self.default.firestoreRulesWhole.match(bem_allRulesRegex)[0];
 
+  self.default.databaseRulesWhole = (jetpack.read(path.resolve(`${__dirname}/../../templates/database.rules.json`))).replace('=0.0.0-', `=${self.default.version}-`);
+  self.default.databaseRulesCore = self.default.databaseRulesWhole.match(bem_allRulesRegex)[0];
 };
 
 Main.prototype.setup = async function () {
@@ -243,7 +245,7 @@ Main.prototype.setup = async function () {
 
   self.getRulesFile();
 
-  self.default.firestoreRulesVersionRegex = new RegExp(`///---version-${self.default.version}---///`)
+  self.default.rulesVersionRegex = new RegExp(`///---version-${self.default.version}---///`)
   // bem_giRegex = new RegExp(jetpack.read(path.resolve(`${__dirname}/../../templates/gitignore.md`)).replace(/\./g, '\\.'), 'm' )
   bem_giRegex = new RegExp(jetpack.read(path.resolve(`${__dirname}/../../templates/gitignore.md`)), 'm' )
 
@@ -478,22 +480,26 @@ Main.prototype.setup = async function () {
 
   // Update actual files
   await self.test('update firestore rules file', function () {
-    let exists = jetpack.exists(`${self.firebaseProjectPath}/firestore.rules`);
-    let contents = jetpack.read(`${self.firebaseProjectPath}/firestore.rules`) || '';
-    let containsCore = contents.match(bem_fsRulesRegex);
-    let matchesVersion = contents.match(self.default.firestoreRulesVersionRegex);
+    const exists = jetpack.exists(`${self.firebaseProjectPath}/firestore.rules`);
+    const contents = jetpack.read(`${self.firebaseProjectPath}/firestore.rules`) || '';
+    const containsCore = contents.match(bem_allRulesRegex);
+    const matchesVersion = contents.match(self.default.rulesVersionRegex);
 
     return (!!exists && !!containsCore && !!matchesVersion);
   }, fix_firestoreRulesFile);
 
   await self.test('update firestore indexes file', function () {
-    let exists = jetpack.exists(`${self.firebaseProjectPath}/firestore.indexes.json`);
+    const exists = jetpack.exists(`${self.firebaseProjectPath}/firestore.indexes.json`);
     return (!!exists);
   }, fix_firestoreIndexesFile);
 
   await self.test('update realtime rules file', function () {
-    let exists = jetpack.exists(`${self.firebaseProjectPath}/database.rules.json`);
-    return (!!exists);
+    const exists = jetpack.exists(`${self.firebaseProjectPath}/database.rules.json`);
+    const contents = jetpack.read(`${self.firebaseProjectPath}/database.rules.json`) || '';
+    const containsCore = contents.match(bem_allRulesRegex);
+    const matchesVersion = contents.match(self.default.rulesVersionRegex);
+
+    return (!!exists && !!containsCore && !!matchesVersion);
   }, fix_realtimeRulesFile);
 
   await self.test('update storage rules file', function () {
@@ -874,61 +880,94 @@ function fix_remoteconfigTemplate(self) {
 
 function fix_firestoreRulesFile(self) {
   return new Promise(function(resolve, reject) {
-    let path = `${self.firebaseProjectPath}/firestore.rules`;
+    const name = 'firestore.rules'
+    let path = `${self.firebaseProjectPath}/${name}`;
     let exists = jetpack.exists(path);
     let contents = jetpack.read(path) || '';
 
     if (!exists || !contents) {
-      log(chalk.yellow(`Writing new firestore.rules file...`));
+      log(chalk.yellow(`Writing new ${name} file...`));
       jetpack.write(path, self.default.firestoreRulesWhole)
       contents = jetpack.read(path) || '';
     }
 
-    let hasTemplate = contents.match(bem_fsRulesRegex) || contents.match(bem_fsRulesBackupRegex);
+    let hasTemplate = contents.match(bem_allRulesRegex) || contents.match(bem_allRulesBackupRegex);
 
     if (!hasTemplate) {
-      log(chalk.red(`Could not find rules template. Please edit firestore.rules file and add`), chalk.red(`{{backend-manager}}`), chalk.red(`to it.`));
+      log(chalk.red(`Could not find rules template. Please edit ${name} file and add`), chalk.red(`{{backend-manager}}`), chalk.red(`to it.`));
       reject()
     }
 
-    let matchesVersion = contents.match(self.default.firestoreRulesVersionRegex);
+    let matchesVersion = contents.match(self.default.rulesVersionRegex);
     if (!matchesVersion) {
       // console.log('replace wih', self.default.firestoreRulesCore);
-      contents = contents.replace(bem_fsRulesBackupRegex, self.default.firestoreRulesCore)
-      contents = contents.replace(bem_fsRulesRegex, self.default.firestoreRulesCore)
+      contents = contents.replace(bem_allRulesBackupRegex, self.default.firestoreRulesCore)
+      contents = contents.replace(bem_allRulesRegex, self.default.firestoreRulesCore)
       jetpack.write(path, contents)
-      log(chalk.yellow(`Writing core rules to firestore.rules file...`));
+      log(chalk.yellow(`Writing core rules to ${name} file...`));
     }
     resolve();
   });
 };
 
-function fix_firestoreIndexesFile(self) {
-  return new Promise(async function(resolve, reject) {
-    const name = 'firestore.indexes.json';
-    let filePath = `${self.firebaseProjectPath}/${name}`;
-    let exists = jetpack.exists(filePath);
+function fix_realtimeRulesFile(self) {
+  return new Promise(function(resolve, reject) {
+    const name = 'database.rules.json'
+    let path = `${self.firebaseProjectPath}/${name}`;
+    let exists = jetpack.exists(path);
+    let contents = jetpack.read(path) || '';
 
-    if (!exists) {
+    if (!exists || !contents) {
       log(chalk.yellow(`Writing new ${name} file...`));
-      await cmd_indexesGet(self, name, false);
+      jetpack.write(path, self.default.databaseRulesWhole)
+      contents = jetpack.read(path) || '';
+    }
+
+    let hasTemplate = contents.match(bem_allRulesRegex) || contents.match(bem_allRulesBackupRegex);
+
+    if (!hasTemplate) {
+      log(chalk.red(`Could not find rules template. Please edit ${name} file and add`), chalk.red(`{{backend-manager}}`), chalk.red(`to it.`));
+      reject()
     }
 
+    let matchesVersion = contents.match(self.default.rulesVersionRegex);
+    if (!matchesVersion) {
+      // console.log('replace wih', self.default.databaseRulesCore);
+      contents = contents.replace(bem_allRulesBackupRegex, self.default.databaseRulesCore)
+      contents = contents.replace(bem_allRulesRegex, self.default.databaseRulesCore)
+      jetpack.write(path, contents)
+      log(chalk.yellow(`Writing core rules to ${name} file...`));
+    }
     resolve();
   });
 };
 
-function fix_realtimeRulesFile(self) {
-  return new Promise(function(resolve, reject) {
-    const name = 'database.rules.json';
+// function fix_realtimeRulesFile(self) {
+//   return new Promise(function(resolve, reject) {
+//     const name = 'database.rules.json';
+//     let filePath = `${self.firebaseProjectPath}/${name}`;
+//     let exists = jetpack.exists(filePath);
+//     let contents = jetpack.read(filePath) || '';
+//
+//     if (!exists) {
+//       log(chalk.yellow(`Writing new ${name} file...`));
+//       jetpack.write(filePath, jetpack.read(path.resolve(`${__dirname}/../../templates/${name}`)))
+//       contents = jetpack.read(filePath) || '';
+//     }
+//
+//     resolve();
+//   });
+// };
+
+function fix_firestoreIndexesFile(self) {
+  return new Promise(async function(resolve, reject) {
+    const name = 'firestore.indexes.json';
     let filePath = `${self.firebaseProjectPath}/${name}`;
     let exists = jetpack.exists(filePath);
-    let contents = jetpack.read(filePath) || '';
 
     if (!exists) {
       log(chalk.yellow(`Writing new ${name} file...`));
-      jetpack.write(filePath, jetpack.read(path.resolve(`${__dirname}/../../templates/${name}`)))
-      contents = jetpack.read(filePath) || '';
+      await cmd_indexesGet(self, name, false);
     }
 
     resolve();

package/src/manager/functions/core/actions/api/admin/get-stats.js

@@ -1,3 +1,5 @@
+let _;
+
 function Module() {
 
 }
@@ -11,6 +13,8 @@ Module.prototype.main = function () {
 
   return new Promise(async function(resolve, reject) {
 
+    _ = Manager.require('lodash')
+
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else {
@@ -21,15 +25,11 @@ Module.prototype.main = function () {
           let data = doc.data() || {};
           let error = null;
 
-          await self.fixStats(data)
+          await self.updateStats(data)
             .catch(e => {
               error = e;
             })
 
-          await self.updateStats()
-            .catch(e => {
-              error = e;
-            })
 
           if (error) {
             return reject(assistant.errorManager(error, {code: 500, sentry: false, send: false, log: false}).error)
@@ -64,63 +64,64 @@ Module.prototype.fixStats = function (data) {
   return new Promise(async function(resolve, reject) {
     const stats = self.libraries.admin.firestore().doc(`meta/stats`);
 
-    if (!data || !data.users || !data.users.total || !data.subscriptions || !data.subscriptions.total) {
-      let usersTotal = 0;
-      let subscriptionsTotal = 0;
-      let error = null;
+
+
+    return resolve();
+  });
+}
+
+Module.prototype.updateStats = function (existingData) {
+  const self = this;
+
+  return new Promise(async function(resolve, reject) {
+    const stats = self.libraries.admin.firestore().doc(`meta/stats`);
+    const online = self.libraries.admin.database().ref(`gatherings/online`);
+
+    let error = null;
+    let update = {};
+
+    // Fix broken stats
+    if (!_.get(existingData, 'users.total', null)) {
       await self.getAllUsers()
         .then(r => {
-          usersTotal = r.length
+          _.set(update, 'users.total', r.length)
         })
         .catch(e => {
           error = new Error(`Failed fixing stats: ${e}`);
-          self.assistant.error(error, {environment: 'production'});
-        })
-      await self.getAllSubscriptions()
-        .then(r => {
-          subscriptionsTotal = r
-        })
-        .catch(e => {
-          error = new Error(`Failed getting subscriptions: ${e}`);
-          self.assistant.error(error, {environment: 'production'});
         })
+    }
 
-      if (error) {
-        return reject(error);
-      }
-      await stats
-        .set({
-          users: {
-            total: usersTotal,
-          },
-          subscriptions: {
-            total: subscriptionsTotal,
-          },
-        }, { merge: true })
-        .catch(function (e) {
-          return reject(e);
-        })
+    if (error) {
+      return reject(error);
     }
 
-    return resolve(data);
-  });
-}
+    // Fetch new stats
+    await self.getAllNotifications()
+      .then(r => {
+        _.set(update, 'notifications.total', r)
+      })
+      .catch(e => {
+        error = new Error(`Failed getting notifications: ${e}`);
+      })
 
-Module.prototype.updateStats = function () {
-  const self = this;
+    await self.getAllSubscriptions()
+      .then(r => {
+        _.set(update, 'subscriptions.total', r)
+      })
+      .catch(e => {
+        error = new Error(`Failed getting subscriptions: ${e}`);
+      })
 
-  return new Promise(async function(resolve, reject) {
-    const stats = self.libraries.admin.firestore().doc(`meta/stats`);
-    let online = self.libraries.admin.database().ref(`gatherings/online`);
-    let onlineCount = 0;
-    let error = null;
+    if (error) {
+      return reject(error);
+    }
 
     await online
       .once('value')
       .then((snap) => {
         let data = snap.val() || {};
         let keys = Object.keys(data);
-        onlineCount = keys.length;
+        _.set(update, 'users.online', keys.length)
       })
       .catch(e => {
         error = new Error(`Failed getting online users: ${e}`);
@@ -131,13 +132,9 @@ Module.prototype.updateStats = function () {
     }
 
     await stats
-      .set({
-        users: {
-          online: onlineCount
-        }
-      }, { merge: true })
+      .set(update, { merge: true })
       .catch(function (e) {
-        return reject(`Failed getting stats: ${e}`);
+        return reject(new Error(`Failed getting stats: ${e}`));
       })
 
     return resolve();
@@ -156,7 +153,7 @@ Module.prototype.getAllUsers = function () {
   });
 }
 
-Module.prototype.getAllSubscriptions = function () {
+Module.prototype.getAllNotifications = function () {
   const self = this;
   return new Promise(async function(resolve, reject) {
     await self.libraries.admin.firestore().collection('notifications/subscriptions/all')
@@ -170,6 +167,33 @@ Module.prototype.getAllSubscriptions = function () {
   });
 }
 
+Module.prototype.getAllSubscriptions = function () {
+  const self = this;
+  return new Promise(async function(resolve, reject) {
+    await self.libraries.admin.firestore().collection('users')
+    .where('plan.expires.timestampUNIX', '>=', new Date().getTime() / 1000)
+    .get()
+    .then(function(snapshot) {
+      let count = 0;
+
+      snapshot
+      .forEach((doc, i) => {
+        const data = doc.data();
+        const planId = _.get(data, 'plan.id', 'basic');
+        if (!['', 'basic', 'free'].includes(planId)) {
+          count++;
+        }
+      });
+
+      return resolve(count);
+    })
+    .catch(function(e) {
+      return reject(e)
+    });
+
+  });
+}
+
 function getUsersBatch(self, nextPageToken) {
   return new Promise(async function(resolve, reject) {
     self.libraries.admin.auth().listUsers(1000, nextPageToken)

package/src/manager/functions/core/actions/api/handler/create-post.js

@@ -29,7 +29,7 @@ Module.prototype.main = function () {
       }
     }
 
-    const postUrl = `blog/${payload.data.payload.url}`;
+    const postUrl = `${Manager.config.brand.url}/blog/${payload.data.payload.url}`;
 
     if (payload.data.payload.invoiceEmail && payload.data.payload.invoicePrice) {
       // Create invoice

package/templates/database.rules.json

@@ -1,31 +1,46 @@
 {
   "rules": {
+    ///---backend-manager---///
+    ///---version=0.0.0---///
+
+    // Gathering rules
     "gatherings": {
       ".read": false,
       ".write": false,
-			"online": {
-        ".read": "auth.uid != null && query.equalTo == auth.uid",
+			"$room": {
+        ".read": "
+        	(auth.uid != null && query.equalTo == auth.uid)
+        ",
         ".write": false,
         ".indexOn": ["uid"],
-        "$uid": {
+        "$id": {
           ".read": "
-          	// Allowed if user is signed in AND is the owner of the doc
+          	// Allowed if user is authenticated AND is the owner of the doc
           	(auth != null && auth.uid == data.child('uid').val())
+            // Allowed if uid is equal to the doc id [LEGACY FOR SOMIIBO]
+            || (auth != null && auth.uid == $id)
+          	// Allowed if user is not authenticated AND is the doc has no owner
+          	|| (auth == null && (data.child('uid').val() == ''))
           ",
           ".write": "
-          	// Allowed if the user is signed in AND is the owner of the existing doc
+          	// Allowed if the user is authenticated AND is the owner of the existing doc
           	(auth != null && auth.uid == data.child('uid').val())
-          	// Allowed if the user is signed in AND is the owner of the new doc
+          	// Allowed if the user is authenticated AND is the owner of the new doc
           	|| (auth != null && auth.uid == newData.child('uid').val())
-          	// Allowed if it's a delete
-          	|| (!newData.exists())
-						// Allowed if the existing doc has no owner
+            // Allowed if the user is authenticated AND is the owner of the existing doc
+          	|| (auth != null && auth.uid == data.child('uid').val())
+            // Allowed if uid is equal to the doc id [LEGACY FOR SOMIIBO]
+            || (auth != null && auth.uid == $id)
+            // Allowed if the existing doc has no owner
           	|| (data.child('uid').val() == '')
           	// Allowed if the new doc has no owner
           	|| (newData.child('uid').val() == '')
+            // Allowed if it's a delete
+          	|| (!newData.exists())
           ",
       	}
       }
-    }
+    },
+    ///---------end---------///
   }
 }