backend-manager 2.5.62 → 2.5.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.62",
+  "version": "2.5.63",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "@google-cloud/storage": "^5.20.5",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
-    "backend-assistant": "^1.0.0",
+    "backend-assistant": "^1.0.1",
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",

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

@@ -1,4 +1,5 @@
 const _ = require('lodash')
+const powertools = require('node-powertools')
 
 function Module() {
 
@@ -12,11 +13,25 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
+    const oldDate = powertools.timestamp(new Date(0), {output: 'string'})
+    const oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
+
     self.Api.resolveUser({adminRequired: false})
     .then(async (user) => {
       const result = {
         plan: {
           id: _.get(user, 'plan.id', 'unknown'),
+          expires: {
+            timestamp: _.get(user, 'plan.expires.timestamp', oldDate),
+            timestampUNIX: _.get(user, 'plan.expires.timestampUNIX', oldDateUNIX),
+          },
+          trial: {
+            activated: _.get(user, 'plan.trial.activated', false),
+            date: {
+              timestamp: _.get(user, 'plan.trial.date.timestamp', oldDate),
+              timestampUNIX: _.get(user, 'plan.trial.date.timestampUNIX', oldDateUNIX),          
+            }
+          },          
           payment: {
             active: _.get(user, 'plan.payment.active', false),
           },

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

@@ -50,9 +50,10 @@ Module.prototype.signOutOfSession = function (uid, session) {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    assistant.log(`Signing out of all active sessions for ${uid} @ ${session}`, {environment: 'production'})
     let count = 0;
 
+    assistant.log(`Signing out of all active sessions for ${uid} @ ${session}`, {environment: 'production'})
+
     await self.libraries.admin.database().ref(session)
     .orderByChild('uid')
     .equalTo(uid)

package/src/manager/helpers/user.js

@@ -6,13 +6,15 @@ const UIDGenerator = require('uid-generator');
 const uidgen = new UIDGenerator(256);
 
 function User(settings, options) {
-  let self = this;
+  const self = this;
+
   settings = settings || {};
   options = options || {};
-  let now = powertools.timestamp(new Date(), {output: 'string'});
-  let nowUNIX = powertools.timestamp(now, {output: 'unix'});
-  let oldDate = powertools.timestamp(new Date(0), {output: 'string'})
-  let oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
+
+  const now = powertools.timestamp(new Date(), {output: 'string'});
+  const nowUNIX = powertools.timestamp(now, {output: 'unix'});
+  const oldDate = powertools.timestamp(new Date(0), {output: 'string'})
+  const oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
 
   const useDefaults = typeof options.defaults === 'undefined' ? true : options.defaults;
 
@@ -33,6 +35,13 @@ function User(settings, options) {
         timestamp: _.get(settings, 'plan.expires.timestamp', useDefaults ? oldDate : null),
         timestampUNIX: _.get(settings, 'plan.expires.timestampUNIX', useDefaults ? oldDateUNIX : null),
       },
+      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),          
+        }
+      },
       limits: {
         // devices: _.get(settings, 'plan.limits.devices', null),
       },
@@ -77,6 +86,25 @@ function User(settings, options) {
       clientId: _.get(settings, 'api.clientId', useDefaults ? `${uuid4()}` : null),
       privateKey: _.get(settings, 'api.privateKey', useDefaults ? `${uidgen.generateSync()}` : null),
     },
+    personal: {
+      birthday: {
+        timestamp: _.get(settings, 'personal.birthday.timestamp', useDefaults ? oldDate : null),
+        timestampUNIX: _.get(settings, 'personal.birthday.timestampUNIX', useDefaults ? oldDateUNIX : null),
+      },
+      gender: _.get(settings, 'personal.gender', useDefaults ? 'undisclosed' : null),
+      location: {
+        city: _.get(settings, 'personal.location.city', useDefaults ? 'undisclosed' : null),
+        country: _.get(settings, 'personal.location.country', useDefaults ? 'ZZ' : null),
+      },
+      name: {
+        first: _.get(settings, 'personal.name.first', useDefaults ? 'undisclosed' : null),
+        last: _.get(settings, 'personal.name.last', useDefaults ? 'undisclosed' : null),
+      },
+      telephone: {
+        countryCode: _.get(settings, 'personal.telephone.countryCode', useDefaults ? 0 : null),
+        national: _.get(settings, 'personal.telephone.national', useDefaults ? 0 : null),
+      },      
+    },    
   }
 
   if (options.prune) {