backend-manager 2.5.62 → 2.5.64

package/firebase-debug.log

@@ -0,0 +1,10 @@
+[debug] [2023-03-24T23:10:48.343Z] ----------------------------------------------------------------------
+[debug] [2023-03-24T23:10:48.344Z] Command:       /Users/ian/.nvm/versions/node/v16.17.0/bin/node /Users/ian/.nvm/versions/node/v16.17.0/bin/firebase deploy
+[debug] [2023-03-24T23:10:48.344Z] CLI Version:   11.8.0
+[debug] [2023-03-24T23:10:48.344Z] Platform:      darwin
+[debug] [2023-03-24T23:10:48.345Z] Node Version:  v16.17.0
+[debug] [2023-03-24T23:10:48.346Z] Time:          Fri Mar 24 2023 16:10:48 GMT-0700 (Pacific Daylight Time)
+[debug] [2023-03-24T23:10:48.347Z] ----------------------------------------------------------------------
+[debug] 
+[error] 
+[error] Error: Not in a Firebase app directory (could not locate firebase.json)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.62",
+  "version": "2.5.64",
   "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": "^1.0.0",
+    "backend-assistant": "^1.0.1",
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",

package/src/manager/functions/core/actions/api/admin/database-read.js

@@ -10,28 +10,20 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    payload.data.payload.path = `${payload.data.payload.path || ''}`;
+    payload.data.payload.options = payload.data.payload.options || {};
 
-    if (payload.user.roles.admin) {
-
-      payload.data.payload.path = `${payload.data.payload.path || ''}`;
-      payload.data.payload.options = payload.data.payload.options || {};
-
-      if (!payload.data.payload.path) {
-        return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
-      } else {
-
-        self.libraries.admin.database().ref(payload.data.payload.path)
-        .on('value', (snapshot) => {
-          const data = snapshot.val();
-          return resolve({data: data});
-        });
-
-      }
-
-    } else {
+    if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+    } else if (!payload.data.payload.path) {
+      return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
+    self.libraries.admin.database().ref(payload.data.payload.path)
+    .on('value', (snapshot) => {
+      const data = snapshot.val();
+      return resolve({data: data});
+    });
   });
 
 };

package/src/manager/functions/core/actions/api/admin/database-write.js

@@ -10,32 +10,24 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    payload.data.payload.path = `${payload.data.payload.path || ''}`;
+    payload.data.payload.document = payload.data.payload.document || {};
+    payload.data.payload.options = payload.data.payload.options || {};
 
     if (payload.user.roles.admin) {
-
-      payload.data.payload.path = `${payload.data.payload.path || ''}`;
-      payload.data.payload.document = payload.data.payload.document || {};
-      payload.data.payload.options = payload.data.payload.options || {};
-
-      if (!payload.data.payload.path) {
-        return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
-      } else {
-
-        self.libraries.admin.database().ref(payload.data.payload.path)
-        .set(payload.data.payload.document)
-        .then(() => {
-          return resolve({data: payload.data.payload.document});
-        })
-        .catch((e) => {
-          return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
-        });        
-
-      }
-
-    } else {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+    } else if (!payload.data.payload.path) {
+      return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error);
     }
 
+    self.libraries.admin.database().ref(payload.data.payload.path)
+    .set(payload.data.payload.document)
+    .then(() => {
+      return resolve({data: payload.data.payload.document});
+    })
+    .catch((e) => {
+      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+    });         
   });
 
 };

package/src/manager/functions/core/actions/api/user/get-subscription-info.js

@@ -1,4 +1,5 @@
 const _ = require('lodash')
+const powertools = require('node-powertools')
 
 function Module() {
 
@@ -12,11 +13,25 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    const oldDate = powertools.timestamp(new Date(0), {output: 'string'})
+    const oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
+
     self.Api.resolveUser({adminRequired: false})
     .then(async (user) => {
       const result = {
         plan: {
           id: _.get(user, 'plan.id', 'unknown'),
+          expires: {
+            timestamp: _.get(user, 'plan.expires.timestamp', oldDate),
+            timestampUNIX: _.get(user, 'plan.expires.timestampUNIX', oldDateUNIX),
+          },
+          trial: {
+            activated: _.get(user, 'plan.trial.activated', false),
+            date: {
+              timestamp: _.get(user, 'plan.trial.date.timestamp', oldDate),
+              timestampUNIX: _.get(user, 'plan.trial.date.timestampUNIX', oldDateUNIX),          
+            }
+          },          
           payment: {
             active: _.get(user, 'plan.payment.active', false),
           },

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

@@ -50,9 +50,10 @@ Module.prototype.signOutOfSession = function (uid, session) {
   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;
 
+    assistant.log(`Signing out of all active sessions for ${uid} @ ${session}`, {environment: 'production'})
+
     await self.libraries.admin.database().ref(session)
     .orderByChild('uid')
     .equalTo(uid)

package/src/manager/functions/core/actions/api.js

@@ -220,18 +220,18 @@ Module.prototype.resolveCommand = function (command) {
 
   command = command || '';
 
-  const resolvedPath = './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`);
-  const pathExists = jetpack.exists(path.join(__dirname, resolvedPath));
+  // Check local path
+  const resolvedPath = resolveApiPath(command);
 
   // if (!command || command === 'error:error') {
-  if (!pathExists) {
-    self.assistant.log(`This command does not exist: ${originalCommand} => ${command} @ ${pathExists}`, {environment: 'production'})
+  if (!resolvedPath) {
+    self.assistant.log(`This command does not exist: ${originalCommand} => ${command} @ ${resolvedPath}`, {environment: 'production'})
   }
 
   return {
     command: command,
     path: resolvedPath,
-    exists: !!pathExists,
+    exists: !!resolvedPath,
   };
 }
 
@@ -290,4 +290,27 @@ function _fixStatus(status) {
   }
 }
 
+function resolveBasePath(basePath, command) {
+  const sanitizedCommand = command.replace(/\.\.\//g, '').replace(/\:/, '/');
+  const resolvedPath = path.join(basePath, `${sanitizedCommand}.js`);
+
+  return resolvedPath;
+};
+
+function resolveApiPath(command) {
+  const projectBasePath = path.join(process.cwd(), 'methods/api');
+  const localBasePath = './api/';
+
+  const projectPath = resolveBasePath(projectBasePath, command);
+  const localPath = path.join(__dirname, resolveBasePath(localBasePath, command));
+
+  if (jetpack.exists(projectPath)) {
+    return projectPath;
+  } else if (jetpack.exists(localPath)) {
+    return localPath;
+  } else {
+    return null;
+  }
+};
+
 module.exports = Module;

package/src/manager/helpers/user.js

@@ -6,13 +6,15 @@ const UIDGenerator = require('uid-generator');
 const uidgen = new UIDGenerator(256);
 
 function User(settings, options) {
-  let self = this;
+  const self = this;
+
   settings = settings || {};
   options = options || {};
-  let now = powertools.timestamp(new Date(), {output: 'string'});
-  let nowUNIX = powertools.timestamp(now, {output: 'unix'});
-  let oldDate = powertools.timestamp(new Date(0), {output: 'string'})
-  let oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
+
+  const now = powertools.timestamp(new Date(), {output: 'string'});
+  const nowUNIX = powertools.timestamp(now, {output: 'unix'});
+  const oldDate = powertools.timestamp(new Date(0), {output: 'string'})
+  const oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
 
   const useDefaults = typeof options.defaults === 'undefined' ? true : options.defaults;
 
@@ -33,6 +35,13 @@ function User(settings, options) {
         timestamp: _.get(settings, 'plan.expires.timestamp', useDefaults ? oldDate : null),
         timestampUNIX: _.get(settings, 'plan.expires.timestampUNIX', useDefaults ? oldDateUNIX : null),
       },
+      trial: {
+        activated: _.get(settings, 'plan.trial.activated', useDefaults ? false : null),
+        date: {
+          timestamp: _.get(settings, 'plan.trial.date.timestamp', useDefaults ? oldDate : null),
+          timestampUNIX: _.get(settings, 'plan.trial.date.timestampUNIX', useDefaults ? oldDateUNIX : null),          
+        }
+      },
       limits: {
         // devices: _.get(settings, 'plan.limits.devices', null),
       },
@@ -77,6 +86,25 @@ function User(settings, options) {
       clientId: _.get(settings, 'api.clientId', useDefaults ? `${uuid4()}` : null),
       privateKey: _.get(settings, 'api.privateKey', useDefaults ? `${uidgen.generateSync()}` : null),
     },
+    personal: {
+      birthday: {
+        timestamp: _.get(settings, 'personal.birthday.timestamp', useDefaults ? oldDate : null),
+        timestampUNIX: _.get(settings, 'personal.birthday.timestampUNIX', useDefaults ? oldDateUNIX : null),
+      },
+      gender: _.get(settings, 'personal.gender', useDefaults ? 'undisclosed' : null),
+      location: {
+        city: _.get(settings, 'personal.location.city', useDefaults ? 'undisclosed' : null),
+        country: _.get(settings, 'personal.location.country', useDefaults ? 'ZZ' : null),
+      },
+      name: {
+        first: _.get(settings, 'personal.name.first', useDefaults ? 'undisclosed' : null),
+        last: _.get(settings, 'personal.name.last', useDefaults ? 'undisclosed' : null),
+      },
+      telephone: {
+        countryCode: _.get(settings, 'personal.telephone.countryCode', useDefaults ? 0 : null),
+        national: _.get(settings, 'personal.telephone.national', useDefaults ? 0 : null),
+      },      
+    },    
   }
 
   if (options.prune) {