backend-manager 3.0.29 → 3.0.30

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

@@ -31,7 +31,7 @@ Module.prototype.init = function (Manager, data) {
   self.assistant.request.data.options = self.assistant.request.data.options || {};
 
   if (Manager.options.log) {
-    self.assistant.log(`Executing (log): ${resolved.command}`, self.assistant.request, JSON.stringify(self.assistant.request), {environment: 'production'})
+    self.assistant.log(`Executing (log): ${resolved.command}`, self.assistant.request, JSON.stringify(self.assistant.request))
   }
 
   return self;
@@ -58,8 +58,8 @@ Module.prototype.main = function() {
       // Resolve command
       const resolved = self.resolveCommand(self.payload.data.command);
 
-      self.assistant.log(`Executing: ${resolved.command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
-      self.assistant.log(`Resolved URL: ${Manager.project.functionsUrl}?command=${encodeURIComponent(resolved.command)}&payload=${encodeURIComponent(JSON.stringify(self.assistant.request.data.payload))}`, {environment: 'development'})
+      self.assistant.log(`Executing: ${resolved.command}`, self.payload, JSON.stringify(self.payload))
+      self.assistant.log(`Resolved URL: ${Manager.project.functionsUrl}?command=${encodeURIComponent(resolved.command)}&payload=${encodeURIComponent(JSON.stringify(self.assistant.request.data.payload))}`)
 
       // Set up options
       self.payload.data.options = self.payload.data.options || {};
@@ -70,7 +70,7 @@ Module.prototype.main = function() {
         let delay = Math.floor(self.payload.data.options.delay / 1000);
 
         await powertools.poll(() => {
-          self.assistant.log(`Delaying for ${delay--} seconds...`, {environment: 'production'});
+          self.assistant.log(`Delaying for ${delay--} seconds...`);
         }, {interval: 1000, timeout: self.payload.data.options.delay})
         .catch(e => e);
       }
@@ -113,7 +113,7 @@ Module.prototype.main = function() {
       res.status(self.payload.response.status)
 
       if (self.payload.response.status >= 200 && self.payload.response.status < 300) {
-        self.assistant.log(`Finished ${resolved.command} (status=${self.payload.response.status})`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
+        self.assistant.log(`Finished ${resolved.command} (status=${self.payload.response.status})`, self.payload, JSON.stringify(self.payload))
 
         if (self.payload.response.redirect) {
           res.redirect(self.payload.response.redirect);
@@ -248,7 +248,7 @@ Module.prototype.resolveCommand = function (command) {
 
   // if (!command || command === 'error:error') {
   if (!resolvedPath) {
-    self.assistant.log(`This command does not exist: ${originalCommand} => ${command} @ ${resolvedPath}`, {environment: 'production'})
+    self.assistant.log(`This command does not exist: ${originalCommand} => ${command} @ ${resolvedPath}`)
   }
 
   return {

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

@@ -49,7 +49,7 @@ let Module = {
       if (!user.roles.admin) {
         response.status = 401;
         response.error = new Error('Unauthenticated, admin required.');
-        assistant.error(response.error, {environment: 'production'})
+        assistant.error(response.error)
       } else {
         mailchimp = new Mailchimp(get(self.Manager.config, 'mailchimp.key', ''));
         await fetch(`https://us-central1-${self.Manager.project.projectId}.cloudfunctions.net/bm_sendNotification`, {
@@ -124,7 +124,7 @@ let Module = {
               })
               .then(async (content) => {
                 await mailchimp.post(`/campaigns/${campaign.id}/actions/send`)
-                assistant.log('Mailchimp campaign created and sent', campaign, {environment: 'production'});
+                assistant.log('Mailchimp campaign created and sent', campaign);
               })
             } else {
               throw new Error('Failed to fetch.');

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

@@ -35,7 +35,7 @@ let Module = {
         action: 'generate-uuid',
         // label: '',
       });
-            
+
       const namespace = assistant.request.data.namespace || self.Manager.config.backend_manager.namespace;
       assistant.request.data.version = `${assistant.request.data.version || '5'}`.replace('v', '');
       assistant.request.data.name = assistant.request.data.name || assistant.request.data.input;
@@ -49,7 +49,7 @@ let Module = {
         response.data.uuid = uuid.v4();
       }
 
-      assistant.log('UUID Generated', assistant.request.data, response, {environment: 'production'});
+      assistant.log('UUID Generated', assistant.request.data, response);
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);

package/src/manager/functions/core/actions/old/api-2.js

@@ -33,10 +33,10 @@ let Module = {
         user: user,
       }
 
-      self.assistant.log('Executing', command, {environment: 'production'})
+      self.assistant.log('Executing', command)
 
       function _errorLog(e) {
-        self.assistant.error(e, {environment: 'production'})
+        self.assistant.error(e)
       }
 
       // Actions
@@ -85,7 +85,7 @@ let Module = {
         response.error = new Error(`Improper command supplied: ${command}`);
       }
 
-      self.assistant.log('Api payload', {object: payload, string: JSON.stringify(payload)}, {environment: 'production'})
+      self.assistant.log('Api payload', {object: payload, string: JSON.stringify(payload)})
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);
@@ -111,7 +111,7 @@ let Module = {
         processor = new (require(processorPath));
         processor.Manager = self.Manager;
       } catch (e) {
-        self.assistant.error('Error loading processor', processorPath, e, {environment: 'production'})
+        self.assistant.error('Error loading processor', processorPath, e)
         return resolve()
       }
 
@@ -208,7 +208,7 @@ let Module = {
           const keys = Object.keys(data || {});
           for (var i = 0; i < keys.length; i++) {
             const key = keys[i];
-            self.assistant.log(`Signing out: ${key}`, {environment: 'production'});
+            self.assistant.log(`Signing out: ${key}`);
             await self.libraries.admin.database().ref(`gatherings/online/${key}/command`).set('signout').catch(e => self.assistant.error(`Failed to signout ${key}`, e))
             await powertools.wait(3000);
             await self.libraries.admin.database().ref(`gatherings/online/${key}`).remove().catch(e => self.assistant.error(`Failed to delete ${key}`, e))
@@ -222,7 +222,7 @@ let Module = {
           .auth()
           .revokeRefreshTokens(uid)
           .then(() => {
-            self.assistant.log('Signed user out of all sessions', payload.user.auth.uid, {environment: 'production'})
+            self.assistant.log('Signed user out of all sessions', payload.user.auth.uid)
             payload.data = {message: `Successfully signed ${payload.user.auth.uid} out of all sessions`}
             return resolve(payload.data);
           })

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

@@ -26,7 +26,7 @@ let Module = {
 
     return libraries.cors(req, res, async () => {
       let user = await assistant.authenticate();
-      
+
       if (!user.authenticated) {
         response.status = 401;
         response.error = new Error('Account does not exist in Auth.');
@@ -63,12 +63,12 @@ let Module = {
         })
       }
 
-      assistant.log('Signup handler:', assistant.request.data, response, {environment: 'production'});
+      assistant.log('Signup handler:', assistant.request.data, response);
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);
       } else {
-        assistant.error('Failed to signup:', assistant.request.data, user, {environment: 'production'});
+        assistant.error('Failed to signup:', assistant.request.data, user);
         return res.status(response.status).send(response.error.message);
       }
     });

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

@@ -44,7 +44,7 @@ let Module = {
       if (!user.roles.admin) {
         response.status = 401;
         response.error = new Error('Unauthenticated, admin required.');
-        assistant.error(response.error, {environment: 'production'})
+        assistant.error(response.error)
       } else {
         // Poster = Poster || require('/Users/ianwiedenman/Documents/GitHub/ITW-Creative-Works/ultimate-jekyll-poster');
         Poster = Poster || require('ultimate-jekyll-poster');
@@ -71,11 +71,11 @@ let Module = {
         .catch((e) => {
           response.status = 400;
           response.error = new Error('Failed to post: ' + e);
-          assistant.error(response.error, {environment: 'production'})
+          assistant.error(response.error)
         })
       }
 
-      assistant.log('Post', assistant.request.data, response, {environment: 'production'});
+      assistant.log('Post', assistant.request.data, response);
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);

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

@@ -51,7 +51,7 @@ let Module = {
         await admin.firestore().doc(options.path)
         .set(options.document, options.options)
         .then(r => {
-          assistant.log(`Wrote to ${options.path}:`, options.document, options.options, {environment: 'production'})
+          assistant.log(`Wrote to ${options.path}:`, options.document, options.options)
         })
         .catch(e => {
           response.status = 500;
@@ -62,7 +62,7 @@ let Module = {
       if (response.status === 200) {
         return res.status(response.status).json(response.data);
       } else {
-        assistant.error(response.error, {environment: 'production'})
+        assistant.error(response.error)
         return res.status(response.status).send(response.error.message);
       }
     });

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

@@ -35,11 +35,11 @@ let Module = {
         action: 'get-stats',
         // label: '',
       });
-            
+
       if (!user.roles.admin) {
         response.status = 401;
         response.error = new Error('Unauthenticated, admin required.');
-        assistant.error(response.error, {environment: 'production'})
+        assistant.error(response.error)
       } else {
         let stats = libraries.admin.firestore().doc(`meta/stats`)
 
@@ -51,14 +51,14 @@ let Module = {
               .catch(e => {
                 response.status = 500;
                 response.error = new Error(`Failed fixing stats: ${e.message}`);
-                assistant.error(response.error, {environment: 'production'})
+                assistant.error(response.error)
               })
 
             await self.updateStats()
               .catch(e => {
                 response.status = 500;
                 response.error = new Error(`Failed updating stats: ${e.message}`);
-                assistant.error(response.error, {environment: 'production'})
+                assistant.error(response.error)
               })
 
             await stats
@@ -69,19 +69,19 @@ let Module = {
               .catch(function (e) {
                 response.status = 500;
                 response.error = e;
-                assistant.error(response.error, {environment: 'production'})
+                assistant.error(response.error)
               })
           })
           .catch(function (e) {
             response.status = 500;
             response.error = e;
-            assistant.error(response.error, {environment: 'production'})
+            assistant.error(response.error)
           })
       }
 
       // response.data = data;
 
-      assistant.log('Stats', assistant.request.data, response, {environment: 'production'});
+      assistant.log('Stats', assistant.request.data, response);
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);
@@ -105,7 +105,7 @@ let Module = {
           .catch(e => {
             response.status = 500;
             response.error = new Error(`Failed fixing stats: ${e.message}`);
-            self.assistant.error(response.error, {environment: 'production'});
+            self.assistant.error(response.error);
           })
         await self.getAllSubscriptions()
           .then(r => {
@@ -114,7 +114,7 @@ let Module = {
           .catch(e => {
             response.status = 500;
             response.error = new Error(`Failed fixing stats: ${e.message}`);
-            self.assistant.error(response.error, {environment: 'production'});
+            self.assistant.error(response.error);
           })
         await stats
           .set({

package/src/manager/functions/core/admin/query.js

@@ -38,11 +38,11 @@ let Module = {
         action: 'query',
         // label: '',
       });
-            
+
       if (!user.roles.admin) {
         response.status = 401;
         response.error = new Error('Unauthenticated, admin required.');
-        assistant.error(response.error, {environment: 'production'})
+        assistant.error(response.error)
       } else {
         self.docs = [];
         // assistant.log('Queries', assistant.request.data.queries);
@@ -62,11 +62,11 @@ let Module = {
           .catch((e) => {
             response.error = e;
             response.status = 400;
-            assistant.error(response.error, {environment: 'production'})
+            assistant.error(response.error)
           })
       }
 
-      assistant.log('Query', assistant.request.data, response, {environment: 'production'});
+      assistant.log('Query', assistant.request.data, response);
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);
@@ -152,7 +152,7 @@ async function runQuery(payload) {
       return resolve(self.docs);
     })
     .catch(function (error) {
-      self.assistant.error(error, {environment: 'production'})
+      self.assistant.error(error)
       return reject(error);
     });
   });

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

@@ -37,7 +37,7 @@ let Module = {
       });
 
       let payload = self.assistant.request.data.payload || {};
-            
+
       if (!payload.title || !payload.body) {
         response.status = 400;
         response.error = new Error('Not enough notification parameters supplied.');
@@ -54,7 +54,7 @@ let Module = {
         await self.getTokens({tags: false});
       }
 
-      assistant.log('Notification', assistant.request.data, response, {environment: 'production'});
+      assistant.log('Notification', assistant.request.data, response);
 
       if (response.status === 200) {
         return res.status(response.status).json(response.data);
@@ -104,7 +104,7 @@ function sendBatch(batch, id) {
         resolve();
       })
       .catch(function (e) {
-        self.assistant.error('Error sending batch #' + id, e, {environment: 'production'});
+        self.assistant.error('Error sending batch #' + id, e);
         // self.result.status = 'fail';
         reject(e);
       })
@@ -150,7 +150,7 @@ function getTokens(options) {
         });
       })
       .catch(function(e) {
-        self.assistant.error('Error querying tokens: ', e, {environment: 'production'})
+        self.assistant.error('Error querying tokens: ', e)
         reject(error);
       });
 
@@ -159,7 +159,7 @@ function getTokens(options) {
         self.assistant.log('Finished all batches.');
       })
       .catch(function(e) {
-        self.assistant.error('Error sending batches: ', e, {environment: 'production'})
+        self.assistant.error('Error sending batches: ', e)
       });
     resolve();
 

package/src/manager/functions/core/cron/daily.js

@@ -35,7 +35,7 @@ Module.prototype.main = function() {
       //   }
       // })
       // .then(response => {
-      //   assistant.log(`Successfully executed backup:`, response, {environment: 'production'})
+      //   assistant.log(`Successfully executed backup:`, response)
       // }),
 
       // Sync Firestore users to the database
@@ -49,14 +49,14 @@ Module.prototype.main = function() {
       //   }
       // })
       // .then(response => {
-      //   assistant.log(`Successfully executed sync-users:`, response, {environment: 'production'})
+      //   assistant.log(`Successfully executed sync-users:`, response)
       // }),
 
       // More daily processes
       // ...
     ])
     .then(() => {
-      assistant.log(`Successfully executed all daily processes:`, {environment: 'production'})
+      assistant.log(`Successfully executed all daily processes:`)
       return resolve();
     })
     .catch(e => {

package/src/manager/functions/core/events/auth/before-signin.js

@@ -26,7 +26,7 @@ Module.prototype.main = function () {
     const functions = self.libraries.functions;
     const admin = self.libraries.admin;
 
-    assistant.log(`Request: ${user.uid}`, user, context, {environment: 'production'});
+    assistant.log(`Request: ${user.uid}`, user, context);
 
     const now = new Date();
 
@@ -54,7 +54,7 @@ Module.prototype.main = function () {
       throw new functions.auth.HttpsError('internal', `Failed to update user: ${update}`);
     }
 
-    assistant.log(`Updated user activity`, {environment: 'production'});
+    assistant.log(`Updated user activity`);
 
     return resolve(self);
   });

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

@@ -41,7 +41,7 @@ Module.prototype.main = function () {
       get(existingUser, 'auth.uid', null)
       || get(existingUser, 'auth.email', null)
     ) {
-      assistant.log(`Skipping handler because user already exists ${user.uid}:`, existingUser, {environment: 'production'});
+      assistant.log(`Skipping handler because user already exists ${user.uid}:`, existingUser);
 
       return resolve(self);
     }
@@ -81,7 +81,7 @@ Module.prototype.main = function () {
     await libraries.admin.firestore().doc(`users/${newUser.auth.uid}`)
       .set(newUser, {merge: true})
       .catch((e) => {
-        assistant.error(`Failed save user record`, e, {environment: 'production'});
+        assistant.error(`Failed save user record`, e);
       })
 
     // Update user count
@@ -90,10 +90,10 @@ Module.prototype.main = function () {
         'users.total': libraries.admin.firestore.FieldValue.increment(1),
       })
       .catch((e) => {
-        assistant.error(`Failed to increment user`, e, {environment: 'production'});
+        assistant.error(`Failed to increment user`, e);
       })
 
-    assistant.log(`User created ${user.uid}:`, newUser, user, context, {environment: 'production'});
+    assistant.log(`User created ${user.uid}:`, newUser, user, context);
 
     return resolve(self);
   });

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

@@ -38,7 +38,7 @@ Module.prototype.main = function () {
     await libraries.admin.firestore().doc(`users/${user.uid}`)
       .delete()
       .catch((e) => {
-        assistant.error(`Delete user failed`, e, {environment: 'production'});
+        assistant.error(`Delete user failed`, e);
       })
 
     // Update user count
@@ -47,10 +47,10 @@ Module.prototype.main = function () {
         'users.total': libraries.admin.firestore.FieldValue.increment(-1),
       })
       .catch((e) => {
-        assistant.error(`Failed to decrement user`, e, {environment: 'production'});
+        assistant.error(`Failed to decrement user`, e);
       })
 
-    assistant.log(`User deleted ${user.uid}:`, user, context, {environment: 'production'});
+    assistant.log(`User deleted ${user.uid}:`, user, context);
 
     return resolve(self);
   });

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

@@ -10,7 +10,7 @@ Module.prototype.init = function (Manager, payload) {
   self.change = payload.change
   self.context = payload.context
 
-  return self;  
+  return self;
 };
 
 Module.prototype.main = function () {
@@ -18,8 +18,8 @@ Module.prototype.main = function () {
   const libraries = self.libraries;
   const assistant = self.assistant;
   const change = self.change;
-  const context = self.context;  
-  
+  const context = self.context;
+
   return new Promise(async function(resolve, reject) {
     const _ = self.Manager.require('lodash');
 
@@ -43,7 +43,7 @@ Module.prototype.main = function () {
       eventType: eventType,
       resource: context.resource,
       params: context.params,
-    }, {environment: 'production'});
+    });
 
     // Delete event
     if (eventType === 'delete') {
@@ -62,12 +62,12 @@ Module.prototype.main = function () {
             // label: 'regular',
           });
 
-          assistant.log('Notification subscription deleted:', dataBefore, {environment: 'production'});
+          assistant.log('Notification subscription deleted:', dataBefore);
 
           return resolve(dataBefore);
         })
         .catch(e => {
-          assistant.error(e, {environment: 'production'});
+          assistant.error(e);
           return reject(e);
         })
 
@@ -92,12 +92,12 @@ Module.prototype.main = function () {
             // label: 'regular',
           });
 
-          assistant.log('Notification subscription created:', dataAfter, {environment: 'production'});
+          assistant.log('Notification subscription created:', dataAfter);
 
           return resolve(dataAfter);
         })
         .catch(e => {
-          assistant.error(e, {environment: 'production'});
+          assistant.error(e);
           return reject(e);
         })
     }

package/src/manager/helpers/assistant.js

@@ -137,8 +137,7 @@ BackendAssistant.prototype.init = function (ref, options) {
   // if (Object.keys(self.request.data).length > 0) {
   //   self.log('Request:', self.request.data, {
   //     ip: self.request.ip,
-
-  //   }, {environment: 'production'});
+  //   });
   // }
 
   // Constants