backend-manager 2.5.67 → 2.5.69

package/package.json

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

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

@@ -15,6 +15,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    // Perform checks
     if (!payload.user.roles.admin && !payload.user.roles.blogger) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }

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

@@ -10,15 +10,18 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    // Set defaults
     payload.data.payload.path = `${payload.data.payload.path || ''}`;
     payload.data.payload.options = payload.data.payload.options || {};
 
+    // Perform checks
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
       return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
+    // Read from Firestore
     self.libraries.admin.database().ref(payload.data.payload.path)
     .on('value', (snapshot) => {
       const data = snapshot.val();

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

@@ -10,16 +10,19 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    // Set defaults
     payload.data.payload.path = `${payload.data.payload.path || ''}`;
     payload.data.payload.document = payload.data.payload.document || {};
     payload.data.payload.options = payload.data.payload.options || {};
 
+    // Perform checks
     if (payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
       return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error);
     }
 
+    // Write to Firestore
     self.libraries.admin.database().ref(payload.data.payload.path)
     .set(payload.data.payload.document)
     .then(() => {

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

@@ -13,11 +13,12 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-
+    // Perform checks    
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
+    // Run queries
     self.docs = [];
     assistant.log('Queries', payload.data.payload.queries);
     let queries = powertools.arrayify(payload.data.payload.queries || []);
@@ -28,6 +29,7 @@ Module.prototype.main = function () {
       promises.push(self.runQuery(queries[i]))
     }
 
+    // Get the results
     await Promise.all(promises)
       .then((r) => {
         return resolve({data: self.docs});

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

@@ -10,29 +10,26 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    // Set defaults
+    payload.data.payload.path = `${payload.data.payload.path || ''}`;
+    payload.data.payload.options = payload.data.payload.options || {};    
 
-    if (payload.user.roles.admin) {
-
-      payload.data.payload.path = `${payload.data.payload.path || ''}`;
-      payload.data.payload.options = payload.data.payload.options || {};
-
-      if (!payload.data.payload.path) {
-        return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
-      } else {
-        await self.libraries.admin.firestore().doc(payload.data.payload.path)
-        .get()
-        .then(doc => {
-          return resolve({data: doc.data()});
-        })
-        .catch(e => {
-          return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
-        })
-      }
-
-    } else {
+    // Perform checks
+    if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+    } else if (!payload.data.payload.path) {
+      return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
+    // Read from Firestore
+    await self.libraries.admin.firestore().doc(payload.data.payload.path)
+    .get()
+    .then(doc => {
+      return resolve({data: doc.data()});
+    })
+    .catch(e => {
+      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+    })    
   });
 
 };

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

@@ -10,26 +10,28 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-
+    // Set defaults
     payload.data.payload.path = `${payload.data.payload.path || ''}`;
     payload.data.payload.document = payload.data.payload.document || {};
     payload.data.payload.options = payload.data.payload.options || {};
     payload.data.payload.options.merge = typeof payload.data.payload.options.merge === 'undefined' ? true : payload.data.payload.options.merge;
 
+    // Perform checks
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
       return reject(assistant.errorManager(`Path parameter required.`, {code: 400, sentry: false, send: false, log: false}).error)
-    } else {
-      await self.libraries.admin.firestore().doc(payload.data.payload.path)
-      .set(payload.data.payload.document, payload.data.payload.options)
-      .then(r => {
-        return resolve({data: {path: payload.data.payload.path}});
-      })
-      .catch(e => {
-        return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
-      })
     }
+
+    // Write to Firestore
+    await self.libraries.admin.firestore().doc(payload.data.payload.path)
+    .set(payload.data.payload.document, payload.data.payload.options)
+    .then(r => {
+      return resolve({data: {path: payload.data.payload.path}});
+    })
+    .catch(e => {
+      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+    })    
   });
 
 };

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

@@ -12,47 +12,49 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-
+    // Load libraries
     _ = Manager.require('lodash')
 
+    // Perform checks
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
-      const stats = self.libraries.admin.firestore().doc(`meta/stats`)
-      await stats
-        .get()
-        .then(async (doc) => {
-          let data = doc.data() || {};
-
-          // Only update if requested
-          if (payload.data.payload.update) {
-            await self.updateStats(data)
-              .catch(e => data = e)
-          }
+    }
 
-          if (data instanceof Error) {
-            return reject(assistant.errorManager(data, {code: 500, sentry: false, send: false, log: false}).error)
-          }
+    // Get stats
+    const stats = self.libraries.admin.firestore().doc(`meta/stats`)
+    await stats
+      .get()
+      .then(async (doc) => {
+        let data = doc.data() || {};
 
-          // Retrieve the stats again after updating
-          await stats
-            .get()
-            .then(doc => {
-              data = doc.data() || {};
-            })
+        // Only update if requested
+        if (payload.data.payload.update) {
+          await self.updateStats(data)
             .catch(e => data = e)
+        }
 
+        if (data instanceof Error) {
+          return reject(assistant.errorManager(data, {code: 500, sentry: false, send: false, log: false}).error)
+        }
 
-          if (data instanceof Error) {
-            return reject(assistant.errorManager(data, {code: 500, sentry: false, send: false, log: false}).error)
-          }
+        // Retrieve the stats again after updating
+        await stats
+          .get()
+          .then(doc => {
+            data = doc.data() || {};
+          })
+          .catch(e => data = e)
 
-          return resolve({data: data})
-        })
-        .catch(function (e) {
-          return reject(assistant.errorManager(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
-        })
-    }
+
+        if (data instanceof Error) {
+          return reject(assistant.errorManager(data, {code: 500, sentry: false, send: false, log: false}).error)
+        }
+
+        return resolve({data: data})
+      })
+      .catch(function (e) {
+        return reject(assistant.errorManager(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      })    
   });
 
 };

package/src/manager/helpers/user.js

@@ -37,10 +37,10 @@ function User(settings, options) {
       },
       trial: {
         activated: _.get(settings, 'plan.trial.activated', useDefaults ? false : null),
-        date: {
-          timestamp: _.get(settings, 'plan.trial.date.timestamp', useDefaults ? oldDate : null),
-          timestampUNIX: _.get(settings, 'plan.trial.date.timestampUNIX', useDefaults ? oldDateUNIX : null),          
-        }
+        expires: {
+          timestamp: _.get(settings, 'plan.trial.expires.timestamp', useDefaults ? oldDate : null),
+          timestampUNIX: _.get(settings, 'plan.trial.expires.timestampUNIX', useDefaults ? oldDateUNIX : null),          
+        },
       },
       limits: {
         // devices: _.get(settings, 'plan.limits.devices', null),