backend-manager 2.3.11 → 2.3.14

package/package.json

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

package/src/cli/cli.js

@@ -895,7 +895,7 @@ function fix_firestoreRulesFile(self) {
 
     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()
+      return resolve()
     }
 
     let matchesVersion = contents.match(self.default.rulesVersionRegex);
@@ -927,7 +927,7 @@ function fix_realtimeRulesFile(self) {
 
     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()
+      return resolve()
     }
 
     let matchesVersion = contents.match(self.default.rulesVersionRegex);

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

@@ -75,7 +75,8 @@ Module.prototype.updateStats = function (existingData) {
 
   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`);
+    const gatheringOnline = self.libraries.admin.database().ref(`gatherings/online`);
+    const sessionsApp = self.libraries.admin.database().ref(`sessions/app`);
 
     let error = null;
     let update = {};
@@ -106,7 +107,7 @@ Module.prototype.updateStats = function (existingData) {
 
     await self.getAllSubscriptions()
       .then(r => {
-        _.set(update, 'subscriptions.total', r)
+        _.set(update, 'subscriptions', r)
       })
       .catch(e => {
         error = new Error(`Failed getting subscriptions: ${e}`);
@@ -116,12 +117,25 @@ Module.prototype.updateStats = function (existingData) {
       return reject(error);
     }
 
-    await online
+    await gatheringOnline
       .once('value')
       .then((snap) => {
-        let data = snap.val() || {};
-        let keys = Object.keys(data);
-        _.set(update, 'users.online', keys.length)
+        const data = snap.val() || {};
+        const keys = Object.keys(data);
+        const existing = _.get(update, 'users.online', 0)
+        _.set(update, 'users.online', existing + keys.length)
+      })
+      .catch(e => {
+        error = new Error(`Failed getting online users: ${e}`);
+      })
+
+    await sessionsApp
+      .once('value')
+      .then((snap) => {
+        const data = snap.val() || {};
+        const keys = Object.keys(data);
+        const existing = _.get(update, 'users.online', 0)
+        _.set(update, 'users.online', existing + keys.length)
       })
       .catch(e => {
         error = new Error(`Failed getting online users: ${e}`);
@@ -174,18 +188,43 @@ Module.prototype.getAllSubscriptions = function () {
     .where('plan.expires.timestampUNIX', '>=', new Date().getTime() / 1000)
     .get()
     .then(function(snapshot) {
-      let count = 0;
+      const stats = {
+        totals: {
+          total: 0,
+          exempt: 0,
+        },
+        plans: {}
+      };
 
       snapshot
       .forEach((doc, i) => {
         const data = doc.data();
         const planId = _.get(data, 'plan.id', 'basic');
-        if (!['', 'basic', 'free'].includes(planId)) {
-          count++;
+        const frequency = _.get(data, 'plan.payment.frequency', 'unknown');
+        const isAdmin = _.get(data, 'roles.admin', false);
+        const isVip = _.get(data, 'roles.vip', false);
+
+        if (!stats.plans[planId]) {
+          stats.plans[planId] = {
+            total: 0,
+            monthly: 0,
+            annually: 0,
+            exempt: 0,
+          }
         }
+
+        if (isAdmin || isVip) {
+          stats.totals.exempt++;
+          stats.plans[planId].exempt++;
+          return
+        }
+
+        stats.totals.total++;
+        stats.plans[planId].total++;
+        stats.plans[planId][frequency] = (stats.plans[planId][frequency] || 0) + 1
       });
 
-      return resolve(count);
+      return resolve(stats);
     })
     .catch(function(e) {
       return reject(e)

package/src/manager/functions/core/actions/api/user/get-active-sessions.js

@@ -16,16 +16,17 @@ Module.prototype.main = function () {
     self.Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       const uid = _.get(user, 'auth.uid', null);
-      const id = _.get(payload.data.payload, 'id', 'sessions/app');
+      const id = _.get(payload.data.payload, 'id', 'app');
+      const session = `sessions/${id}`;
 
-      assistant.log(`Getting active sessions for ${uid} @ ${id}`, {environment: 'production'})
+      assistant.log(`Getting active sessions for ${uid} @ ${session}`, {environment: 'production'})
 
-      await self.libraries.admin.database().ref(id)
+      await self.libraries.admin.database().ref(session)
       .orderByChild('uid')
       .equalTo(uid)
       .once('value')
       .then(async (snap) => {
-        const data = (snap.val() || []).filter(i => i);
+        const data = snap.val() || {};
         return resolve({data: data});
       })
       .catch(e => {

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

@@ -16,34 +16,20 @@ Module.prototype.main = function () {
     self.Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       const uid = _.get(user, 'auth.uid', null);
-      const id = _.get(payload.data.payload, 'id', 'sessions/app');
-
-      assistant.log(`Signing out of all active sessions for ${uid} @ ${id}`, {environment: 'production'})
-
-      await self.libraries.admin.database().ref(id)
-      .orderByChild('uid')
-      .equalTo(uid)
-      .once('value')
-      .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(`${id}/${key}/command`).set('signout').catch(e => self.assistant.error(`Failed to signout ${key}`, e))
-          await powertools.wait(3000);
-          await self.libraries.admin.database().ref(`${id}/${key}`).remove().catch(e => self.assistant.error(`Failed to delete ${key}`, e))
-        }
-      })
-      .catch(e => {
-        console.error('Session query error', e);
-      })
+      const id = _.get(payload.data.payload, 'id', 'app');
+      const session = `sessions/${id}`;
+
+      let count = 0;
+
+      await self.signOutOfSession(uid, session).then(r => count += r);
+      // Legacy for somiibo and old electron-manager
+      await self.signOutOfSession(uid, 'gatherings/online').then(r => count += r);
 
       await self.libraries.admin
         .auth()
         .revokeRefreshTokens(uid)
         .then(() => {
-          return resolve({data: {message: `Successfully signed ${uid} out of all sessions`}});
+          return resolve({data: {sessions: count, message: `Successfully signed ${uid} out of all sessions`}});
         })
         .catch(e => {
           return reject(assistant.errorManager(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
@@ -56,5 +42,39 @@ Module.prototype.main = function () {
 
 };
 
+Module.prototype.signOutOfSession = function (uid, session) {
+  const self = this;
+  const Manager = self.Manager;
+  const Api = self.Api;
+  const assistant = self.assistant;
+  const payload = self.payload;
+
+  return new Promise(async function(resolve, reject) {
+    assistant.log(`Signing out of all active sessions for ${uid} @ ${session}`, {environment: 'production'})
+    let count = 0;
+
+    await self.libraries.admin.database().ref(session)
+    .orderByChild('uid')
+    .equalTo(uid)
+    .once('value')
+    .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))
+        // await powertools.wait(3000);
+        // await self.libraries.admin.database().ref(`${session}/${key}`).remove().catch(e => self.assistant.error(`Failed to delete ${key}`, e))
+        count++;
+      }
+      return resolve(count);
+    })
+    .catch(e => {
+      assistant.errorManager(`Session query error for session ${session}: ${e}`, {code: 500, sentry: true, send: false, log: true})
+      return reject(count)
+    })
+  });
+}
 
 module.exports = Module;