backend-manager 2.0.21 → 2.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.0.21",
+  "version": "2.0.24",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -57,6 +57,7 @@
     "ultimate-jekyll-poster": "^0.0.10",
     "universal-analytics": "^0.5.3",
     "uuid": "^8.3.2",
+    "wonderful-fetch": "^0.0.4",
     "yargs": "^17.4.1"
   },
   "files": [
@@ -64,4 +65,4 @@
     "src/",
     "templates/"
   ]
-}
+}

package/src/cli/cli.js

@@ -208,7 +208,7 @@ Main.prototype.getRulesFile = function () {
 Main.prototype.setup = async function () {
   let self = this;
   let cwd = fs.cwd();
-  log(chalk.green(`\n---- RUNNING SETUP ----`));
+  log(chalk.green(`\n---- RUNNING v${this.default.version} SETUP ----`));
   this.package = fs.read(`${this.firebaseProjectPath}/functions/package.json`) || '{}';
   this.firebaseJSON = fs.read(`${this.firebaseProjectPath}/firebase.json`) || '{}';
   this.firebaseRC = fs.read(`${this.firebaseProjectPath}/.firebaserc`) || '{}';
@@ -385,7 +385,7 @@ Main.prototype.setup = async function () {
       let item = ogPaths[i];
       if (!item) {continue}
       pass = (_.get(bemConfig, item, undefined));
-      if (typeof pass === 'undefined') {
+      if (typeof pass === 'undefined' || typeof pass === '') {
         break;
       }
     }

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

@@ -7,20 +7,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -5,20 +5,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -6,20 +6,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 
@@ -42,8 +32,7 @@ Module.prototype.main = function () {
 
     assistant.log('UUID Generated', payload.data.payload, result, {environment: 'production'});
 
-    // Return the timestamp so electron-manager can save an http request >:)
-    return resolve({data: {uuid: result, timestamp: new Date().toISOString()}});
+    return resolve({data: {uuid: result}});
 
   });
 

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

@@ -5,20 +5,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

package/src/manager/functions/core/actions/api/special/setup-electron-manager-client.js

@@ -0,0 +1,71 @@
+function Module() {
+
+}
+
+Module.prototype.main = function () {
+  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) {
+
+    const fetch = Manager.require('wonderful-fetch');
+
+    const uid = payload.data.payload.uid;
+    const app = payload.data.payload.appId || payload.data.payload.app || Manager.config.app.id;
+
+    let uuid = null;
+    let error;
+
+    // Generate uuid
+    if (uid) {
+      await Api.import('general:generate-uuid', {version: 5, name: uid})
+      .then(library => {
+
+        library.main()
+        .then(result => {
+          uuid = result.data.uuid;
+        })
+        .catch(e => {
+          error = e;
+        })
+      })
+    }
+
+    if (error) {
+      return reject(error)
+    }
+
+    // Fetch app details
+    await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/getApp', {
+      method: 'post',
+      timeout: 30000,
+      tries: 3,
+      json: true,
+      body: {
+        id: app,
+      },
+    })
+    .then(result => {
+      return resolve({
+        data: {
+          uuid: uuid,
+          timestamp: new Date().toISOString(),
+          ip: assistant.request.ip,
+          country: assistant.request.country,
+          app: result,
+        }
+      });
+    })
+    .catch(e => {
+      return reject(new Error(`Error fetching app details: ${e}`))
+    })
+
+  });
+
+};
+
+
+module.exports = Module;

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -5,20 +5,10 @@ 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;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -36,19 +36,18 @@ Module.prototype.main = function() {
     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 resolved = self.resolveCommand(self.payload.data.command);
 
-    self.assistant.log(`Executing: ${command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
+    self.assistant.log(`Executing: ${resolved.command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
 
-    try {
-      const lib = new (require(commandPath))();
+    await self.import(resolved.command)
+    .then(async lib => {
       try {
-        await lib.init(self, self.payload);
+        // Call main function
         await lib.main()
-        .then(r => {
-          self.payload.response.status = r.status || 200;
-          self.payload.response.data = r.data || {};
+        .then(result => {
+          self.payload.response.status = result.status || 200;
+          self.payload.response.data = result.data || {};
         })
         .catch(e => {
           self.payload.response.status = e.code || 500;
@@ -58,22 +57,59 @@ Module.prototype.main = function() {
         self.payload.response.status = 500;
         self.payload.response.error = e || new Error('Unknown error occured');
       }
-    } catch (e) {
+    })
+    .catch(e => {
       self.payload.response.status = 400;
-      self.payload.response.error = new Error(`Improper command supplied: ${command}`);
-      assistant.log('Dev error log', e)
-    }
+      self.payload.response.error = new Error(`Failed to import: ${e}`);
+    })
 
     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}`, self.payload.response.error)
+      console.error(`Error executing ${self.payload.data.command} => ${resolved.command} @ ${resolved.path}`, 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}`);
     }
   });
 }
 
+Module.prototype.import = function (command, payload, user, response) {
+  const self = this;
+
+  return new Promise(function(resolve, reject) {
+    const resolved = self.resolveCommand(command);
+
+    try {
+      const lib = new (require(resolved.path))();
+
+      // Initialize
+      lib.Api = self;
+      lib.Manager = self.Manager;
+      lib.libraries = self.Manager.libraries;
+      lib.assistant = self.assistant;
+      lib.payload = _.cloneDeep({
+        data: {
+          payload: payload ? payload : self.payload.data.payload,
+        },
+        user: user ? user : self.payload.user,
+        response: response ? response : self.payload.response,
+      });
+
+      // lib.payload = {};
+      //
+      // // Set payload and user if it's provided
+      // lib.payload.data.payload = payload ? _.cloneDeep(payload) : lib.payload.data.payload;
+      // lib.payload.user = user ? _.cloneDeep(user) : lib.payload.user;
+      // lib.payload.response = response ? _.cloneDeep(response) : lib.payload.response;
+
+      return resolve(lib);
+    } catch (e) {
+      return reject(e);
+    }
+
+  });
+}
+
 Module.prototype.resolveCommand = function (command) {
   const self = this;
 
@@ -116,6 +152,10 @@ Module.prototype.resolveCommand = function (command) {
   } else if (command === 'admin:payment-processor' || command === 'payment-processor') { // rename: admin:payment-processor
     command = 'admin:payment-processor';
 
+  // Special
+  } else if (command === 'special:setup-electron-manager-client' || command === 'setup-electron-manager-client') {
+    command = 'special:setup-electron-manager-client';
+
   // Test
   } else if (command === 'test:authenticate' || command === 'authenticate') {
     command = 'test:authenticate';
@@ -126,10 +166,13 @@ Module.prototype.resolveCommand = function (command) {
 
   // End
   } else {
-    command = '';
+    command = 'error:error';
   }
 
-  return command;
+  return {
+    command: command,
+    path: './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`),
+  };
 }
 
 Module.prototype.resolveUser = function (options) {

package/src/manager/index.js

@@ -90,13 +90,14 @@ Manager.prototype.init = function (exporter, options) {
   }
 
   if (self.options.sentry) {
-    // console.log('Setting up sentry:', `${self.project.projectId}@${self.package.version}`);
-    // console.log('self.config.sentry.dsn', self.config.sentry.dsn);
+    const sentryRelease = `${self.config.app.id || self.project.projectId}@${self.package.version}`;
     const sentryDSN = get(self.config, 'sentry.dsn', '');
+    // console.log('Sentry', sentryRelease, sentryDSN);
+
     self.libraries.sentry = require('@sentry/node');
     self.libraries.sentry.init({
       dsn: sentryDSN,
-      release: `${self.project.projectId}@${self.package.version}`,
+      release: sentryRelease,
       beforeSend(event, hint) {
         if (self.assistant.meta.environment === 'development' && !self.options.reportErrorsInDev) {
           self.assistant.error('Skipping Sentry because DEV')

package/templates/backend-manager-config.json

@@ -1,4 +1,7 @@
 {
+  "app": {
+    "id": "my-app"
+  },
   "brand": {
     "name": "My Brand",
     "url": "https://example.com",