backend-manager 2.0.31 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.0.31",
+  "version": "2.1.0",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -35,9 +35,9 @@
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.0.1",
     "firebase-admin": "^9.12.0",
-    "firebase-functions": "^3.21.0",
+    "firebase-functions": "^3.21.1",
     "fs-jetpack": "^4.3.1",
     "hcaptcha": "^0.1.1",
     "inquirer": "^8.2.4",
@@ -54,11 +54,11 @@
     "semver": "^7.3.7",
     "shortid": "^2.2.16",
     "uid-generator": "^2.0.0",
-    "ultimate-jekyll-poster": "^0.0.10",
+    "ultimate-jekyll-poster": "^0.0.11",
     "universal-analytics": "^0.5.3",
     "uuid": "^8.3.2",
-    "wonderful-fetch": "^0.0.4",
-    "yargs": "^17.4.1"
+    "wonderful-fetch": "^0.0.5",
+    "yargs": "^17.5.0"
   },
   "files": [
     "bin/",

package/src/cli/cli.js

@@ -582,6 +582,17 @@ Main.prototype.setup = async function () {
     console.log(chalk.yellow(`You should continue to run ${chalk.bold('npx bm setup')} until you pass all tests and fix all errors.`));
   }
 
+  // Notify parent that finished with test results
+  if (process.send) {
+    process.send({
+      sender: 'electron-manager',
+      command: 'setup:complete',
+      payload: {
+        passed: self.testCount === self.testTotal,
+      }
+    });
+  }
+
   return;
 
 };

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

@@ -15,8 +15,32 @@ Module.prototype.main = function () {
 
   return new Promise(async function(resolve, reject) {
 
-    // console.log('----self.Manager.libraries', self.Manager.libraries);
-    // console.log('----self.Manager.libraries.sentry 1', self.Manager.libraries.sentry);
+    // Set up response obj
+    payload.response.data = {
+      subscribers: 0,
+      batches: 0,
+      sent: 0,
+      deleted: 0,
+    }
+
+    // Fix notification payload
+    self._notificationPayload = {
+      notification: self.payload.data.payload.notification || {},
+    };
+    self._notificationPayload.notification.title = self.payload.data.payload.title || self.payload.data.payload.notification.title || 'Notification';
+    self._notificationPayload.notification.click_action = self.payload.data.payload.click_action || self.payload.data.payload.notification.click_action || 'https://itwcreativeworks.com';
+    self._notificationPayload.notification.body = self.payload.data.payload.body || self.payload.data.payload.notification.body || 'Check this out';
+    self._notificationPayload.notification.icon = self.payload.data.payload.icon || self.payload.data.payload.notification.icon || self.Manager.config.brand.brandmark || 'https://cdn.itwcreativeworks.com/assets/itw-creative-works/images/socials/itw-creative-works-brandmark-black-1024x1024.png';
+
+    try {
+      self._notificationPayload.notification.click_action = new URL(self._notificationPayload.notification.click_action);
+      self._notificationPayload.notification.click_action.searchParams.set('cb', new Date().getTime())
+      self._notificationPayload.notification.click_action = self._notificationPayload.notification.click_action.toString()
+    } catch (e) {
+      assistant.errorManager(`Failed to add cb to URL: ${e}`, {code: 500, sentry: false, send: false, log: true})
+    }
+
+    assistant.log('Resolved notification payload', self._notificationPayload, {environment: 'production'})
 
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
@@ -28,7 +52,7 @@ Module.prototype.main = function () {
 
     await self.getTokens({tags: false})
     .then(r => {
-      return resolve({data: r})
+      return resolve({data: payload.response.data})
     })
     .catch(e => {
       return reject(assistant.errorManager(`Failed to send notification: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
@@ -54,6 +78,7 @@ Module.prototype.getTokens = function (options) {
       .get()
       .then(function(querySnapshot) {
         self.assistant.log(`Queried ${querySnapshot.size} tokens.`);
+        self.payload.response.data.subscribers = querySnapshot.size;
         // self.result.subscriptionsStart = querySnapshot.size;
         let batchCurrentSize = 0;
         let batchSizeMax = 1000;
@@ -74,6 +99,7 @@ Module.prototype.getTokens = function (options) {
             batchPromises.push(self.sendBatch(batchCurrent, batchId));
             batchCurrent = [];
             batchCurrentSize = 0;
+            self.payload.response.data.batches++;
           }
           batchLoops++;
         });
@@ -103,20 +129,7 @@ Module.prototype.sendBatch = function (batch, id) {
 
     // self.assistant.log('payload', payload);
 
-    let payload = {};
-    payload.notification = {};
-    payload.notification.title = self.payload.data.payload.title;
-    payload.notification.clickAction = self.payload.data.payload.click_action || self.payload.data.payload.clickAction;
-    payload.notification.click_action = self.payload.data.payload.click_action || self.payload.data.payload.clickAction;
-    payload.notification.body = self.payload.data.payload.body;
-    payload.notification.icon = self.payload.data.payload.icon || self.Manager.config.brand.brandmark;
-
-    // payload.data = {};
-    // payload.data.clickAction = self.payload.data.payload.click_action || self.payload.data.payload.clickAction;
-    // payload.data.click_action = self.payload.data.payload.click_action || self.payload.data.payload.clickAction;
-
-
-    await self.libraries.admin.messaging().sendToDevice(batch, payload)
+    await self.libraries.admin.messaging().sendToDevice(batch, self._notificationPayload)
       .then(async function (response) {
         // self.result.batches.list.push('#' + id + ' | ' + '✅  ' + response.successCount + ' | ' + '❌  ' + response.failureCount);
         self.assistant.log('Sent batch #' + id);
@@ -126,6 +139,7 @@ Module.prototype.sendBatch = function (batch, id) {
         if (response.failureCount > 0) {
           await self.cleanTokens(batch, response.results, id);
         }
+        self.payload.response.data.sent += (batch.length - response.failureCount);
         resolve();
       })
       .catch(function (e) {
@@ -145,7 +159,9 @@ Module.prototype.cleanTokens = function (batch, results, id) {
     self.assistant.log(`Cleaning tokens of batch ID: ${id}`);
 
     results.forEach(function (item, index) {
-      if (!item.error) { return false; }
+      if (!item.error) {
+        return false;
+      }
       let curCode = item.error.code;
       let token = batch[index];
       self.assistant.log(`Found bad token: ${index} = ${curCode}`);
@@ -168,6 +184,7 @@ Module.prototype.deleteToken = function (token, errorCode) {
       .delete()
       .then(function() {
         self.assistant.log(`Deleting bad token: ${token} for reason ${errorCode}`);
+        self.payload.response.data.deleted++;
         resolve();
       })
       .catch(function(error) {

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

@@ -1,4 +1,4 @@
-const fetch = require('node-fetch');
+const fetch = require('wonderful-fetch');
 const _ = require('lodash')
 
 function Module() {
@@ -18,88 +18,116 @@ Module.prototype.main = function () {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
-    const createdInvoice = await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/wrapper', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        authenticationToken: Manager.config.backend_manager.key,
-        method: 'post',
-        service: 'paypal',
-        command: 'v2/invoicing/invoices',
-        body: {
-          detail: {
-            currency_code: 'USD',
-            note: `Post to ${Manager.config.brand.name}`,
-          },
-          primary_recipients: [
-            {
-              billing_info: {
-                email_address: payload.data.payload.invoiceEmail,
-              },
-            }
-          ],
-          items: [
-            {
-              name: `Guest post`,
-              description: `blog/${payload.data.payload.url}`,
-              quantity: '1',
-              unit_amount: {
-                currency_code: 'USD',
-                value: `${payload.data.payload.invoicePrice}`
-              },
-              // discount: {
-              //   percent: '5'
-              // },
-              unit_of_measure: 'QUANTITY'
+    payload.response.data = {
+      invoice: {
+        success: false,
+        data: {},
+      },
+      notification: {
+        success: false,
+        data: {},
+      }
+    }
+
+    const postUrl = `blog/${payload.data.payload.url}`;
+
+    if (payload.data.payload.invoiceEmail && payload.data.payload.invoicePrice) {
+      // Create invoice
+      const createdInvoice = await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/wrapper', {
+        method: 'POST',
+        json: true,
+        body: JSON.stringify({
+          authenticationToken: Manager.config.backend_manager.key,
+          method: 'post',
+          service: 'paypal',
+          command: 'v2/invoicing/invoices',
+          body: {
+            detail: {
+              currency_code: 'USD',
+              note: `Post to ${Manager.config.brand.name}`,
             },
-          ],
-        }
-      }),
-    })
-    .then(function (res) {
-      return res.text()
-        .then(function (data) {
-          if (res.ok) {
-            return JSON.parse(data)
-          } else {
-            throw new Error(data || res.statusText || 'Unknown error.')
+            primary_recipients: [
+              {
+                billing_info: {
+                  email_address: payload.data.payload.invoiceEmail,
+                },
+              }
+            ],
+            items: [
+              {
+                name: `Guest post`,
+                description: postUrl,
+                quantity: '1',
+                unit_amount: {
+                  currency_code: 'USD',
+                  value: `${payload.data.payload.invoicePrice}`
+                },
+                // discount: {
+                //   percent: '5'
+                // },
+                unit_of_measure: 'QUANTITY'
+              },
+            ],
           }
-        })
-    })
-    .catch(function (e) {
-      return e;
-    });
+        }),
+      })
+      .then(response => response)
+      .catch(e => e);
+
+      if (createdInvoice instanceof Error) {
+        return reject(assistant.errorManager(createdInvoice, {code: 400, sentry: false, send: false, log: false}).error)
+      }
+
+      // Send invoice
+      const createdInvoiceId = _.get(createdInvoice, 'href', '').split('/').pop();
+      const sentInvoice = await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/wrapper', {
+        method: 'POST',
+        json: true,
+        body: JSON.stringify({
+          authenticationToken: Manager.config.backend_manager.key,
+          service: 'paypal',
+          command: `v2/invoicing/invoices/${createdInvoiceId}/send`,
+          method: 'post',
+          body: {
+          }
+        }),
+      })
+      .then(response => response)
+      .catch(e => e);
+
+      if (sentInvoice instanceof Error) {
+        return reject(assistant.errorManager(sentInvoice, {code: 500, sentry: false, send: false, log: false}).error)
+      }
+
+      payload.response.data.invoice = {
+        success: true,
+        data: sentInvoice,
+      }
 
-    if (createdInvoice instanceof Error) {
-      return reject(assistant.errorManager(createdInvoice, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
-    const createdInvoiceId = _.get(createdInvoice, 'href', '').split('/').pop();
-    const sentInvoice = await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/wrapper', {
+
+    // Send notification
+    const sentNotification = fetch(`https://us-central1-${Manager.project.projectId}.cloudfunctions.net/bm_api`, {
       method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
+      json: true,
       body: JSON.stringify({
         authenticationToken: Manager.config.backend_manager.key,
-        service: 'paypal',
-        command: `v2/invoicing/invoices/${createdInvoiceId}/send`,
-        method: 'post',
-        body: {
+        command: `admin:send-notification`,
+        payload: {
+          title: payload.data.payload.title,
+          body: `"${payload.data.payload.title}" was just published on our blog. It's a great read and we think you'll enjoy the content!`,
+          click_action: `${Manager.config.brand.url}/${postUrl}`,
+          icon: Manager.config.brand.brandmark,
         }
       }),
     })
-    .then(function (res) {
-      return res.text()
-        .then(function (data) {
-          if (res.ok) {
-            return resolve({data: JSON.parse(data)})
-          } else {
-            throw new Error(data || res.statusText || 'Unknown error.')
-          }
-        })
-    })
-    .catch(function (e) {
-      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
-    });
+    .then(response => response)
+    .catch(e => e);
+
+
+    return resolve({data: payload.response.data})
+
 
   });
 

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

@@ -0,0 +1,55 @@
+const fetch = require('node-fetch');
+const _ = require('lodash')
+
+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) {
+
+    if (!payload.user.roles.admin) {
+      self.assistant.log('User is not admin')
+    }
+
+    const url = 'https://itwcreativeworks.com';
+    const title = 'https://itwcreativeworks.com';
+    const icon = 'https://cdn.itwcreativeworks.com/assets/itw-creative-works/images/socials/itw-creative-works-brandmark-black-1024x1024.png?cb=1651834176';
+
+
+    await Api.import('admin:send-notification', {
+      title: 'New blog post!',
+      click_action: url,
+      body: `"${title}" was just published on our blog. It's a great read and we think you'll enjoy the content!`,
+      icon: icon,
+    })
+    .then(library => {
+
+      console.log('----');
+
+      library.main()
+      .then(result => {
+        return resolve({data: {success: true}});
+      })
+      .catch(e => {
+        console.error('Error', e);
+      })
+
+    })
+
+    // if (error) {
+    //
+    // }
+
+  });
+
+};
+
+
+module.exports = Module;

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const _ = require('lodash');
+const jetpack = require('fs-jetpack');
 
 function Module() {
 
@@ -22,6 +23,11 @@ Module.prototype.init = function (Manager, data) {
     user: {},
   };
 
+  // Fix the two required
+  const resolved = self.resolveCommand(self.assistant.request.data.command);
+  self.assistant.request.data.command = resolved.command;
+  self.assistant.request.data.payload = self.assistant.request.data.payload || {};
+
   return self;
 }
 
@@ -40,33 +46,39 @@ Module.prototype.main = function() {
 
     self.assistant.log(`Executing: ${resolved.command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
 
-    await self.import(resolved.command)
-    .then(async lib => {
-      try {
-        // Call main function
-        await lib.main()
-        .then(result => {
-          self.payload.response.status = result.status || 200;
-          self.payload.response.data = result.data || {};
-        })
-        .catch(e => {
-          self.payload.response.status = e.code || 500;
-          self.payload.response.error = e || new Error('Unknown error occured');
-        })
-      } catch (e) {
-        self.payload.response.status = 500;
-        self.payload.response.error = e || new Error('Unknown error occured');
-      }
-    })
-    .catch(e => {
+    if (!resolved.exists) {
       self.payload.response.status = 400;
-      self.payload.response.error = new Error(`Failed to import: ${e}`);
-    })
+      self.payload.response.error = new Error(`${self.payload.data.command} is not a valid command`);
+    } else {
+      await self.import(resolved.command)
+      .then(async lib => {
+        try {
+          // Call main function
+          await lib.main()
+          .then(result => {
+            result = result || {};
+            self.payload.response.status = result.status || self.payload.response.status || 200;
+            self.payload.response.data = result.data || self.payload.response.data || {};
+          })
+          .catch(e => {
+            self.payload.response.status = e.code || 500;
+            self.payload.response.error = e || new Error('Unknown error occured');
+          })
+        } catch (e) {
+          self.payload.response.status = 500;
+          self.payload.response.error = e || new Error('Unknown error occured');
+        }
+      })
+      .catch(e => {
+        self.payload.response.status = 400;
+        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 ${self.payload.data.command} => ${resolved.command} @ ${resolved.path}`, self.payload.response.error)
+      console.error(`Error executing ${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}`);
     }
@@ -89,12 +101,19 @@ Module.prototype.import = function (command, payload, user, response) {
       lib.assistant = self.assistant;
       lib.payload = _.cloneDeep({
         data: {
+          // command: '?',
           payload: payload ? payload : self.payload.data.payload,
         },
         user: user ? user : self.payload.user,
         response: response ? response : self.payload.response,
       });
 
+      if (self.payload.data.backendManagerKey) {
+        lib.payload.data.backendManagerKey = self.payload.data.backendManagerKey;
+      } else if (self.payload.data.authenticationToken) {
+        lib.payload.data.authenticationToken = self.payload.data.authenticationToken;
+      }
+
       // lib.payload = {};
       //
       // // Set payload and user if it's provided
@@ -112,6 +131,7 @@ Module.prototype.import = function (command, payload, user, response) {
 
 Module.prototype.resolveCommand = function (command) {
   const self = this;
+  const originalCommand = command;
 
   // Start
   if (false) {
@@ -153,25 +173,36 @@ Module.prototype.resolveCommand = function (command) {
     command = 'admin:payment-processor';
 
   // Special
-  } else if (command === 'special:setup-electron-manager-client' || command === 'setup-electron-manager-client') {
-    command = 'special:setup-electron-manager-client';
+  // } 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';
-  } else if (command === 'test:create-test-accounts' || command === 'create-test-accounts') {
-    command = 'test:create-test-accounts';
-  } else if (command === 'test:webhook' || command === 'webhook') {
-    command = 'test:webhook';
+  // } else if (command === 'test:authenticate' || command === 'authenticate') {
+  //   command = 'test:authenticate';
+  // } else if (command === 'test:create-test-accounts' || command === 'create-test-accounts') {
+  //   command = 'test:create-test-accounts';
+  // } else if (command === 'test:webhook' || command === 'webhook') {
+  //   command = 'test:webhook';
 
   // End
   } else {
-    command = 'error:error';
+    // command = 'error:error';
+  }
+
+  command = command || '';
+
+  const resolvedPath = './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`);
+  const pathExists = jetpack.exists(path.join(__dirname, resolvedPath));
+
+  // if (!command || command === 'error:error') {
+  if (!pathExists) {
+    self.assistant.log(`This command does not exist: ${originalCommand} => ${command} @ ${pathExists}`, {environment: 'production'})
   }
 
   return {
     command: command,
-    path: './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`),
+    path: resolvedPath,
+    exists: !!pathExists,
   };
 }