backend-manager 2.0.3 → 2.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "@google-cloud/storage": "^5.19.2",
     "@sendgrid/mail": "^7.6.2",
     "@sentry/node": "^6.19.6",
-    "backend-assistant": "^0.0.58",
+    "backend-assistant": "^0.0.59",
     "busboy": "^0.3.1",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",

package/src/cli/cli.js

@@ -241,6 +241,11 @@ Main.prototype.setup = async function () {
   this.projectUrl = `https://console.firebase.google.com/project/${this.projectName}`;
   log(chalk.black(`Id: `, chalk.bold(`${this.projectName}`)));
   log(chalk.black(`Url:`, chalk.bold(`${this.projectUrl}`)));
+
+  if (!self.package || !self.package.engines || !self.package.engines.node) {
+    throw new Error('Missing <engines.node> in package.json')
+  }
+
   await this.test('is a firebase project', async function () {
     let exists = fs.exists(`${self.firebaseProjectPath}/firebase.json`);
     return exists;
@@ -263,17 +268,17 @@ Main.prototype.setup = async function () {
     return self.package.engines.node.toString() === CLI_CONFIG.node && processMajor >= engineMajor;
   }, fix_nodeVersion);
 
-  await this.test('project level package.json exists', async function () {
-    return !!(self.projectPackage && self.projectPackage.version && self.projectPackage.name);
-  }, fix_projpackage);
+  // await this.test('project level package.json exists', async function () {
+  //   return !!(self.projectPackage && self.projectPackage.version && self.projectPackage.name);
+  // }, fix_projpackage);
 
   await this.test('functions level package.json exists', async function () {
-    return !!self.package.dependencies && !!self.package.devDependencies;
+    return !!self.package && !!self.package.dependencies && !!self.package.devDependencies;
   }, fix_deps);
 
-  await this.test('functions level package.json has updated version', async function () {
-    return self.package.version === self.projectPackage.version;
-  }, fix_packageversion);
+  // await this.test('functions level package.json has updated version', async function () {
+  //   return self.package.version === self.projectPackage.version;
+  // }, fix_packageversion);
 
   await this.test('using updated firebase-admin', async function () {
     let pkg = 'firebase-admin';
@@ -656,7 +661,7 @@ async function fix_serviceAccount(self) {
 
 function fix_nodeVersion(self) {
   return new Promise(function(resolve, reject) {
-    _.set(self.package, 'engines.node', '12')
+    _.set(self.package, 'engines.node', CLI_CONFIG.node)
 
     fs.write(`${self.firebaseProjectPath}/functions/package.json`, JSON.stringify(self.package, null, 2) );
     resolve();

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

@@ -9,6 +9,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.assistant;

package/src/manager/functions/core/actions/api/admin/firestore-query.js

@@ -7,6 +7,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

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

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

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

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

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

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

package/src/manager/functions/core/actions/api/admin/payment-processor.js

@@ -6,6 +6,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

package/src/manager/functions/core/actions/api/admin/send-notification.js

@@ -8,6 +8,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.assistant;

package/src/manager/functions/core/actions/api/general/generate-uuid.js

@@ -6,6 +6,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -39,7 +40,7 @@ Module.prototype.main = function () {
 
     assistant.log('UUID Generated', payload.data.payload, result, {environment: 'production'});
 
-    return resolve({data: {uuid: result}});
+    return resolve({data: {uuid: result, timestamp: new Date().toISOString()}});
 
   });
 

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

@@ -7,6 +7,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

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

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -24,6 +25,14 @@ Module.prototype.main = function () {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
+    // self.Api.resolveUser({adminRequired: false})
+    // .then(async (user) => {
+    //
+    // })
+    // .catch(e => {
+    //   return reject(e);
+    // })
+
     return resolve({data: {success: true}});
 
   });

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

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

package/src/manager/functions/core/actions/api/test/create-test-accounts.js

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

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

@@ -4,6 +4,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;

package/src/manager/functions/core/actions/api/user/create-custom-token.js

@@ -6,6 +6,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -21,31 +22,8 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    let user = null;
-    if (payload.user.roles.admin && payload.data.payload.uid) {
-      await self.libraries.admin.firestore().doc(`users/${payload.data.payload.uid}`)
-      .get()
-      .then(async function (doc) {
-        const data = doc.data();
-        if (data) {
-          user = data;
-        } else {
-          throw new Error('User does not exist')
-        }
-      })
-      .catch(function (e) {
-        user = e;
-      })
-    } else if (payload.user.authenticated) {
-      user = payload.user;
-    }
-
-    if (user instanceof Error) {
-      return reject(assistant.errorManager(user, {code: 400, sentry: false, send: false, log: false}).error)
-    } else if (!user) {
-      return reject(assistant.errorManager(`Admin or authenticated user required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
-
+    self.Api.resolveUser({adminRequired: true})
+    .then(async (user) => {
       await self.libraries.admin.auth().createCustomToken(_.get(user, 'auth.uid', null))
       .then(token => {
         return resolve({data: {token: token}});
@@ -53,10 +31,11 @@ Module.prototype.main = function () {
       .catch(e => {
         return reject(assistant.errorManager(`Failed to create custom token: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
       })
-    }
-
+    })
+    .catch(e => {
+      return reject(e);
+    })
   });
-
 };
 
 

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

@@ -6,6 +6,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -21,30 +22,8 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    let user = null;
-    if (payload.user.roles.admin && payload.data.payload.uid) {
-      await self.libraries.admin.firestore().doc(`users/${payload.data.payload.uid}`)
-      .get()
-      .then(async function (doc) {
-        const data = doc.data();
-        if (data) {
-          user = data;
-        } else {
-          throw new Error('User does not exist')
-        }
-      })
-      .catch(function (e) {
-        user = e;
-      })
-    } else if (payload.user.authenticated) {
-      user = payload.user;
-    }
-
-    if (user instanceof Error) {
-      return reject(assistant.errorManager(user, {code: 400, sentry: false, send: false, log: false}).error)
-    } else if (!user) {
-      return reject(assistant.errorManager(`Admin or authenticated user required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
+    self.Api.resolveUser({adminRequired: true})
+    .then(async (user) => {
       // const planExpireDate = new Date(_.get(payload.user, 'plan.expires.timestamp', 0));
       // if (planExpireDate >= new Date()) {
       //   payload.response.status = 401;
@@ -63,8 +42,10 @@ Module.prototype.main = function () {
       .catch(e => {
         return reject(assistant.errorManager(`Failed to delete user: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
       })
-    }
-
+    })
+    .catch(e => {
+      return reject(e);
+    })
   });
 
 };

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

@@ -6,6 +6,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -21,32 +22,8 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    let user = null;
-    // TODO FIX
-    // if (payload.user.roles.admin && payload.data.payload.uid) {
-    if (payload.data.payload.uid) {
-      await self.libraries.admin.firestore().doc(`users/${payload.data.payload.uid}`)
-      .get()
-      .then(async function (doc) {
-        const data = doc.data();
-        if (data) {
-          user = data;
-        } else {
-          throw new Error('User does not exist')
-        }
-      })
-      .catch(function (e) {
-        user = e;
-      })
-    } else if (payload.user.authenticated) {
-      user = payload.user;
-    }
-
-    if (user instanceof Error) {
-      return reject(assistant.errorManager(user, {code: 400, sentry: false, send: false, log: false}).error)
-    } else if (!user) {
-      return reject(assistant.errorManager(`Admin or authenticated user required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
+    self.Api.resolveUser({adminRequired: false})
+    .then(async (user) => {
       const result = {
         plan: {
           id: _.get(user, 'plan.id', 'unknown'),
@@ -56,9 +33,11 @@ Module.prototype.main = function () {
         }
       }
       return resolve({data: result});
-    }
+    })
+    .catch(e => {
+      return reject(e);
+    })
   });
-
 };
 
 

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

@@ -6,6 +6,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -21,30 +22,9 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    let user = null;
-    if (payload.user.roles.admin && payload.data.payload.uid) {
-      await self.libraries.admin.firestore().doc(`users/${payload.data.payload.uid}`)
-      .get()
-      .then(async function (doc) {
-        const data = doc.data();
-        if (data) {
-          user = data;
-        } else {
-          throw new Error('User does not exist')
-        }
-      })
-      .catch(function (e) {
-        user = e;
-      })
-    } else if (payload.user.authenticated) {
-      user = payload.user;
-    }
 
-    if (user instanceof Error) {
-      return reject(assistant.errorManager(user, {code: 400, sentry: false, send: false, log: false}).error)
-    } else if (!user) {
-      return reject(assistant.errorManager(`Admin or authenticated user required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
+    self.Api.resolveUser({adminRequired: true})
+    .then(async (user) => {
       const uid = _.get(user, 'auth.uid', null);
 
       await self.libraries.admin.database().ref(`gatherings/online`)
@@ -75,9 +55,10 @@ Module.prototype.main = function () {
         .catch(e => {
           return reject(assistant.errorManager(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
         })
-
-    }
-
+    })
+    .catch(e => {
+      return reject(e);
+    })
   });
 
 };

package/src/manager/functions/core/actions/api/user/sign-up.js

@@ -7,6 +7,7 @@ function Module() {
 
 Module.prototype.init = async function (s, payload) {
   const self = this;
+  self.Api = s;
   self.Manager = s.Manager;
   self.libraries = s.Manager.libraries;
   self.assistant = s.Manager.assistant;
@@ -22,61 +23,40 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    let user = null;
-    if (payload.user.roles.admin && payload.data.payload.uid) {
-      await self.libraries.admin.firestore().doc(`users/${payload.data.payload.uid}`)
-      .get()
-      .then(async function (doc) {
-        const data = doc.data();
-        if (data) {
-          user = data;
-        } else {
-          throw new Error('User does not exist')
-        }
-      })
-      .catch(function (e) {
-        user = e;
-      })
-    } else if (payload.user.authenticated) {
-      user = payload.user;
-    }
-
-    if (user instanceof Error) {
-      return reject(assistant.errorManager(user, {code: 400, sentry: false, send: false, log: false}).error)
-    } else if (!user) {
-      return reject(assistant.errorManager(`Admin or authenticated user required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
-
-      await self.signUp({
-        auth: {
-          uid: _.get(user, 'auth.uid', null),
-          email: _.get(user, 'auth.email', null),
-        },
-        affiliate: {
-          referrer: _.get(payload.data.payload, 'affiliateCode', null),
-        },
-      })
-      .then(async function (result) {
-        if (_.get(payload.data.payload, 'newsletterSignUp', false)) {
-          await addToMCList(
-            _.get(Manager.config, 'mailchimp.key'),
-            _.get(Manager.config, 'mailchimp.list_id'),
-            _.get(user, 'auth.email', null),
-          )
-          .then(function (res) {
-            assistant.log('Sucessfully added user to MC list.')
-          })
-          .catch(function (e) {
-            assistant.log('Failed to add user to MC list.', e)
-          })
-        }
-        return resolve({data: result});
-      })
-      .catch(function (e) {
-        return reject(assistant.errorManager(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
-      })
-
-    }
+    self.Api.resolveUser({adminRequired: true})
+    .then(async (user) => {
+        await self.signUp({
+          auth: {
+            uid: _.get(user, 'auth.uid', null),
+            email: _.get(user, 'auth.email', null),
+          },
+          affiliate: {
+            referrer: _.get(payload.data.payload, 'affiliateCode', null),
+          },
+        })
+        .then(async function (result) {
+          if (_.get(payload.data.payload, 'newsletterSignUp', false)) {
+            await addToMCList(
+              _.get(Manager.config, 'mailchimp.key'),
+              _.get(Manager.config, 'mailchimp.list_id'),
+              _.get(user, 'auth.email', null),
+            )
+            .then(function (res) {
+              assistant.log('Sucessfully added user to MC list.')
+            })
+            .catch(function (e) {
+              assistant.log('Failed to add user to MC list.', e)
+            })
+          }
+          return resolve({data: result});
+        })
+        .catch(function (e) {
+          return reject(assistant.errorManager(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        })
+    })
+    .catch(e => {
+      return reject(e);
+    })
 
   });
 

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

@@ -1,4 +1,5 @@
 const path = require('path');
+const _ = require('lodash');
 
 function Module() {
 
@@ -11,6 +12,15 @@ Module.prototype.init = function (Manager, data) {
   self.assistant = Manager.Assistant({req: data.req, res: data.res})
   self.req = data.req;
   self.res = data.res;
+  self.payload = {
+    response: {
+      status: 200,
+      data: {},
+      error: null,
+    },
+    data: {},
+    user: {},
+  };
 
   return self;
 }
@@ -23,56 +33,50 @@ Module.prototype.main = function() {
   const res = self.res;
 
   return libraries.cors(req, res, async () => {
-    const response = {
-      status: 200,
-      data: {},
-      error: null,
-    };
-    const user = await assistant.authenticate();
-    const command = resolveCommand(assistant.request.data.command);
+    self.payload.data = assistant.request.data;
+    self.payload.user = await assistant.authenticate();
+
+    const command = self.resolveCommand(self.payload.data.command);
     const commandPath = './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`);
-    const payload = {
-      response: response,
-      data: assistant.request.data,
-      user: user,
-    }
 
-    self.assistant.log(`Executing: ${command}`, payload, JSON.stringify(payload), {environment: 'production'})
+    self.assistant.log(`Executing: ${command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
 
     try {
       const lib = new (require(commandPath))();
       try {
-        await lib.init(self, payload);
+        await lib.init(self, self.payload);
         await lib.main()
         .then(r => {
-          response.status = r.status || 200;
-          response.data = r.data || {};
+          self.payload.response.status = r.status || 200;
+          self.payload.response.data = r.data || {};
         })
         .catch(e => {
-          response.status = e.code || 500;
-          response.error = e || new Error('Unknown error occured');
+          self.payload.response.status = e.code || 500;
+          self.payload.response.error = e || new Error('Unknown error occured');
         })
       } catch (e) {
-        response.status = 500;
-        response.error = e || new Error('Unknown error occured');
+        self.payload.response.status = 500;
+        self.payload.response.error = e || new Error('Unknown error occured');
       }
     } catch (e) {
-      response.status = 400;
-      response.error = new Error(`Improper command supplied: ${command}`);
+      self.payload.response.status = 400;
+      self.payload.response.error = new Error(`Improper command supplied: ${command}`);
       assistant.log('Dev error log', e)
     }
 
-    if (response.status === 200) {
-      return res.status(response.status).json(response.data);
+    if (self.payload.response.status === 200) {
+      return res.status(self.payload.response.status).json(self.payload.response.data);
     } else {
-      console.error(`Error executing ${command} @ ${commandPath}`, response.error)
-      // return res.status(response.status).send(response.error.message);
-      return res.status(response.status).send(`${response.error}`);
+      console.error(`Error executing ${command} @ ${commandPath}`, self.payload.response.error)
+      // return res.status(self.payload.response.status).send(self.payload.response.error.message);
+      return res.status(self.payload.response.status).send(`${self.payload.response.error}`);
     }
   });
 }
 
-function resolveCommand(command) {
+Module.prototype.resolveCommand = function (command) {
+  const self = this;
+
   // Start
   if (false) {
 
@@ -128,4 +132,47 @@ function resolveCommand(command) {
   return command;
 }
 
+Module.prototype.resolveUser = function (options) {
+  const self = this;
+  return new Promise(async function(resolve, reject) {
+    let user = null;
+
+    options = options || {};
+    options.uid = typeof options.uid !== 'undefined' ? options.uid : self.payload.data.payload.uid;
+    options.admin = typeof options.admin !== 'undefined' ? options.admin : self.payload.user.roles.admin;
+    options.adminRequired = typeof options.adminRequired !== 'undefined' ? options.adminRequired : true;
+
+    if (options.uid) {
+      if (options.adminRequired && !options.admin) {
+        user = self.assistant.errorManager('Admin required', {code: 401, sentry: false, send: false, log: false}).error;
+      } else {
+        await self.libraries.admin.firestore().doc(`users/${options.uid}`)
+        .get()
+        .then(async function (doc) {
+          const data = doc.data();
+          if (data) {
+            user = data;
+          } else {
+            user = self.assistant.errorManager(`User does not exist: ${options.uid}`, {code: 400, sentry: false, send: false, log: false}).error;
+          }
+        })
+        .catch(function (e) {
+          user = self.assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error;
+        })
+      }
+    } else if (self.payload.user.authenticated) {
+      user = self.payload.user;
+    }
+
+    if (user instanceof Error) {
+      return reject(user);
+    } else if (!user) {
+      return reject(self.assistant.errorManager('Unable to resolve user', {code: 500, sentry: false, send: false, log: false}).error);
+    } else {
+      return resolve(user);
+    }
+
+  });
+};
+
 module.exports = Module;