backend-manager 2.4.19 → 2.4.23

package/package.json

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

package/src/cli/cli.js

@@ -477,7 +477,7 @@ Main.prototype.setup = async function () {
     jetpack.remove(`${self.firebaseProjectPath}/${tempPath}`)
 
     return !localIndexes_exists || equal
-  }, NOFIX);
+  }, fix_indexesSync);
 
   await self.test('add roles/datastore.importExportAdmin', async function () {
     const result = await cmd_iamImportExport(self).catch(e => e);
@@ -895,6 +895,29 @@ function fix_remoteconfigTemplate(self) {
   });
 };
 
+function fix_indexesSync(self) {
+  return new Promise(function(resolve, reject) {
+    inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'replace',
+        message: 'Would you like to replace the local indexes?',
+        default: true,
+      }
+    ])
+    .then(async (answer) => {
+      if (answer.replace) {
+        cmd_indexesGet(self, undefined, true)
+        .then(r => {
+          return resolve();
+        })
+      } else {
+        return reject();
+      }
+    })    
+  });
+};
+
 function fix_firestoreRulesFile(self) {
   return new Promise(function(resolve, reject) {
     const name = 'firestore.rules'

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

@@ -28,6 +28,10 @@ Module.prototype.init = function (Manager, data) {
   self.assistant.request.data.command = resolved.command;
   self.assistant.request.data.payload = self.assistant.request.data.payload || {};
 
+  if (Manager.options.log) {
+    self.assistant.log(`Executing (log): ${resolved.command}`, self.assistant.request, JSON.stringify(self.assistant.request), {environment: 'production'})
+  }
+
   return self;
 }
 

package/src/manager/functions/core/events/auth/on-create.js

@@ -1,26 +1,32 @@
-let Module = {
-  init: async function (Manager, data) {
-    this.Manager = Manager;
-    this.libraries = Manager.libraries;
-    this.assistant = Manager.Assistant();
-    this.user = data.user
-
-    return this;
-  },
-  main: async function() {
-    let self = this;
-    let libraries = self.libraries;
-    let assistant = self.assistant;
-    let user = self.user;
-
-    let newUser = self.Manager.User({
+function Module() {
+  const self = this;
+}
+
+Module.prototype.init = function (Manager, payload) {
+  const self = this;
+  self.Manager = Manager;
+  self.libraries = Manager.libraries;
+  self.assistant = Manager.Assistant();
+  self.user = payload.user
+
+  return self;  
+};
+
+Module.prototype.main = function () {
+  const self = this;
+  const libraries = self.libraries;
+  const assistant = self.assistant;
+  const user = self.user;
+
+  return new Promise(async function(resolve, reject) {
+    const newUser = self.Manager.User({
       auth: {
         uid: user.uid,
         email: user.email,
       }
     });
 
-    let analytics = self.Manager.Analytics({
+    const analytics = self.Manager.Analytics({
       assistant: assistant,
       uuid: user.uid,
     })
@@ -56,7 +62,8 @@ let Module = {
       })
 
     assistant.log('User created:', user, {environment: 'production'});
-  },
-}
+    return resolve(self);      
+  });
+};
 
 module.exports = Module;

package/src/manager/functions/core/events/auth/on-delete.js

@@ -1,19 +1,25 @@
-let Module = {
-  init: async function (Manager, data) {
-    this.Manager = Manager;
-    this.libraries = Manager.libraries;
-    this.assistant = Manager.Assistant();
-    this.user = data.user
-
-    return this;
-  },
-  main: async function() {
-    let self = this;
-    let libraries = self.libraries;
-    let assistant = self.assistant;
-    let user = self.user;
-
-    let analytics = self.Manager.Analytics({
+function Module() {
+  const self = this;
+}
+
+Module.prototype.init = function (Manager, payload) {
+  const self = this;
+  self.Manager = Manager;
+  self.libraries = Manager.libraries;
+  self.assistant = Manager.Assistant();
+  self.user = payload.user
+
+  return self;  
+};
+
+Module.prototype.main = function () {
+  const self = this;
+  const libraries = self.libraries;
+  const assistant = self.assistant;
+  const user = self.user;
+
+  return new Promise(async function(resolve, reject) {
+    const analytics = self.Manager.Analytics({
       assistant: assistant,
       uuid: user.uid,
     })
@@ -39,8 +45,10 @@ let Module = {
         assistant.error(e, {environment: 'production'});
       })
 
-    assistant.log('User deleted:', user, {environment: 'production'});
-  },
-}
+    assistant.log('User deleted:', user, {environment: 'production'}); 
+    
+    return resolve(self);
+  });
+};
 
 module.exports = Module;

package/src/manager/functions/core/events/firestore/on-subscription.js

@@ -1,27 +1,34 @@
-let Module = {
-  init: async function (Manager, data) {
-    this.Manager = Manager;
-    this.libraries = Manager.libraries;
-    this.assistant = Manager.Assistant();
-    this.change = data.change
-    this.context = data.context
-
-    return this;
-  },
-  main: async function() {
-    let self = this;
-    let libraries = self.libraries;
-    let assistant = self.assistant;
-    let change = self.change;
-    let context = self.context;
-
-    let _ = self.Manager.require('lodash');
+function Module() {
+  const self = this;
+}
 
-    let analytics;
+Module.prototype.init = function (Manager, payload) {
+  const self = this;
+  self.Manager = Manager;
+  self.libraries = Manager.libraries;
+  self.assistant = Manager.Assistant();
+  self.change = payload.change
+  self.context = payload.context
+
+  return self;  
+};
 
-    let dataBefore = change.before.data();
-    let dataAfter = change.after.data();
+Module.prototype.main = function () {
+  const self = this;
+  const libraries = self.libraries;
+  const assistant = self.assistant;
+  const change = self.change;
+  const context = self.context;  
+  
+  return new Promise(async function(resolve, reject) {
+    const _ = self.Manager.require('lodash');
+
+    const dataBefore = change.before.data();
+    const dataAfter = change.after.data();
+
+    let analytics;
     let eventType;
+
     if (dataAfter == undefined) {
       eventType = 'delete';
     } else if (dataBefore && dataAfter) {
@@ -54,15 +61,19 @@ let Module = {
             action: 'notification-unsubscribe',
             // label: 'regular',
           });
+
           assistant.log('Notification subscription deleted:', dataBefore, {environment: 'production'});
+
+          return resolve(dataBefore);
         })
         .catch(e => {
           assistant.error(e, {environment: 'production'});
+          return reject(e);
         })
 
     // Update event
   } else if (eventType === 'update') {
-      // ...
+    return resolve();
 
     // Create event
   } else if (eventType === 'create') {
@@ -82,13 +93,17 @@ let Module = {
           });
 
           assistant.log('Notification subscription created:', dataAfter, {environment: 'production'});
+
+          return resolve(dataAfter);
         })
         .catch(e => {
           assistant.error(e, {environment: 'production'});
+          return reject(e);
         })
     }
 
-  },
-}
+  });
+};
+
 
 module.exports = Module;

package/src/manager/index.js

@@ -400,6 +400,7 @@ Manager.prototype.init = function (exporter, options) {
 Manager.prototype._process = function (mod) {
   const self = this;
   const name = mod.assistant.meta.name;
+  const method = mod.assistant.request.method;
   const hook = self.handlers && self.handlers[name];
   const req = mod.req;
   const res = mod.res;
@@ -407,6 +408,11 @@ Manager.prototype._process = function (mod) {
   return new Promise(async function(resolve, reject) {
     let error;
 
+    console.log('---method', method);
+    if (method === 'OPTIONS') {
+      return resolve();
+    }
+
     function _reject(e, log) {
       if (log) {
         // self.assistant.error(e, {environment: 'production'});