backend-manager 2.0.19 → 2.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.0.19",
+  "version": "2.0.22",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -57,6 +57,7 @@
     "ultimate-jekyll-poster": "^0.0.10",
     "universal-analytics": "^0.5.3",
     "uuid": "^8.3.2",
+    "wonderful-fetch": "^0.0.3",
     "yargs": "^17.4.1"
   },
   "files": [
@@ -64,4 +65,4 @@
     "src/",
     "templates/"
   ]
-}
+}

package/src/cli/cli.js

@@ -385,7 +385,7 @@ Main.prototype.setup = async function () {
       let item = ogPaths[i];
       if (!item) {continue}
       pass = (_.get(bemConfig, item, undefined));
-      if (typeof pass === 'undefined') {
+      if (typeof pass === 'undefined' || typeof pass === '') {
         break;
       }
     }

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

@@ -7,20 +7,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -5,20 +5,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

package/src/manager/functions/core/actions/api/admin/payment-processor.js

@@ -4,20 +4,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -6,20 +6,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 
@@ -42,8 +32,7 @@ Module.prototype.main = function () {
 
     assistant.log('UUID Generated', payload.data.payload, result, {environment: 'production'});
 
-    // Return the timestamp so electron-manager can save an http request >:)
-    return resolve({data: {uuid: result, timestamp: new Date().toISOString()}});
+    return resolve({data: {uuid: result}});
 
   });
 

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

@@ -5,20 +5,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

package/src/manager/functions/core/actions/api/special/setup-electron-manager-client.js

@@ -0,0 +1,71 @@
+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) {
+
+    const fetch = Manager.require('wonderful-fetch');
+
+    const uid = payload.data.payload.uid;
+    const app = payload.data.payload.appId || payload.data.payload.app || Manager.config.app.id;
+
+    let uuid = null;
+    let error;
+
+    // Generate uuid
+    if (uid) {
+      await Api.import('general:generate-uuid', {version: 5, name: uid})
+      .then(library => {
+
+        library.main()
+        .then(result => {
+          uuid = result.data.uuid;
+        })
+        .catch(e => {
+          error = e;
+        })
+      })
+    }
+
+    if (error) {
+      return reject(error)
+    }
+
+    // Fetch app details
+    await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/getApp', {
+      method: 'post',
+      timeout: 30000,
+      tries: 3,
+      json: true,
+      body: {
+        id: app,
+      },
+    })
+    .then(result => {
+      return resolve({
+        data: {
+          uuid: uuid,
+          timestamp: new Date().toISOString(),
+          ip: assistant.request.ip,
+          country: assistant.request.country,
+          app: result,
+        }
+      });
+    })
+    .catch(e => {
+      return reject(new Error(`Error fetching app details: ${e}`))
+    })
+
+  });
+
+};
+
+
+module.exports = Module;

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

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

package/src/manager/functions/core/actions/api/test/create-test-accounts.js

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -2,20 +2,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

package/src/manager/functions/core/actions/api/user/create-custom-token.js

@@ -4,20 +4,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -4,20 +4,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -5,20 +5,10 @@ function Module() {
 
 }
 
-Module.prototype.init = async function (s, payload) {
-  const self = this;
-  self.Api = s;
-  self.Manager = s.Manager;
-  self.libraries = s.Manager.libraries;
-  self.assistant = s.Manager.assistant;
-  self.payload = payload;
-
-  return self;
-};
-
 Module.prototype.main = function () {
   const self = this;
   const Manager = self.Manager;
+  const Api = self.Api;
   const assistant = self.assistant;
   const payload = self.payload;
 

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

@@ -36,19 +36,18 @@ Module.prototype.main = function() {
     self.payload.data = assistant.request.data;
     self.payload.user = await assistant.authenticate();
 
-    const command = self.resolveCommand(self.payload.data.command);
-    const commandPath = './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`);
+    const resolved = self.resolveCommand(self.payload.data.command);
 
-    self.assistant.log(`Executing: ${command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
+    self.assistant.log(`Executing: ${resolved.command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})
 
-    try {
-      const lib = new (require(commandPath))();
+    await self.import(resolved.command)
+    .then(async lib => {
       try {
-        await lib.init(self, self.payload);
+        // Call main function
         await lib.main()
-        .then(r => {
-          self.payload.response.status = r.status || 200;
-          self.payload.response.data = r.data || {};
+        .then(result => {
+          self.payload.response.status = result.status || 200;
+          self.payload.response.data = result.data || {};
         })
         .catch(e => {
           self.payload.response.status = e.code || 500;
@@ -58,22 +57,59 @@ Module.prototype.main = function() {
         self.payload.response.status = 500;
         self.payload.response.error = e || new Error('Unknown error occured');
       }
-    } catch (e) {
+    })
+    .catch(e => {
       self.payload.response.status = 400;
-      self.payload.response.error = new Error(`Improper command supplied: ${command}`);
-      assistant.log('Dev error log', e)
-    }
+      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 ${command} @ ${commandPath}`, self.payload.response.error)
+      console.error(`Error executing ${self.payload.data.command} => ${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}`);
     }
   });
 }
 
+Module.prototype.import = function (command, payload, user, response) {
+  const self = this;
+
+  return new Promise(function(resolve, reject) {
+    const resolved = self.resolveCommand(command);
+
+    try {
+      const lib = new (require(resolved.path))();
+
+      // Initialize
+      lib.Api = self;
+      lib.Manager = self.Manager;
+      lib.libraries = self.Manager.libraries;
+      lib.assistant = self.assistant;
+      lib.payload = _.cloneDeep({
+        data: {
+          payload: payload ? payload : self.payload.data.payload,
+        },
+        user: user ? user : self.payload.user,
+        response: response ? response : self.payload.response,
+      });
+
+      // lib.payload = {};
+      //
+      // // Set payload and user if it's provided
+      // lib.payload.data.payload = payload ? _.cloneDeep(payload) : lib.payload.data.payload;
+      // lib.payload.user = user ? _.cloneDeep(user) : lib.payload.user;
+      // lib.payload.response = response ? _.cloneDeep(response) : lib.payload.response;
+
+      return resolve(lib);
+    } catch (e) {
+      return reject(e);
+    }
+
+  });
+}
+
 Module.prototype.resolveCommand = function (command) {
   const self = this;
 
@@ -116,6 +152,10 @@ Module.prototype.resolveCommand = function (command) {
   } else if (command === 'admin:payment-processor' || command === 'payment-processor') { // rename: admin:payment-processor
     command = 'admin:payment-processor';
 
+  // Special
+  } 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';
@@ -126,10 +166,13 @@ Module.prototype.resolveCommand = function (command) {
 
   // End
   } else {
-    command = '';
+    command = 'error:error';
   }
 
-  return command;
+  return {
+    command: command,
+    path: './' + path.join('./api/', `${command.replace(/\.\.\//g, '').replace(/\:/, '/')}.js`),
+  };
 }
 
 Module.prototype.resolveUser = function (options) {

package/src/manager/helpers/api-manager.js

@@ -13,9 +13,11 @@ let sampleUser = {
     }
   },
   authenticated: false,
-  _meta: {
-    lastStatsReset: new Date(),
-    lastUserFetch: new Date(),
+  _APIManager: {
+    meta: {
+      lastStatsReset: new Date(),
+      lastUserFetch: new Date(),
+    }
   }
 }
 
@@ -42,7 +44,7 @@ ApiManager.prototype.init = function (options) {
     options.plans = options.plans || {};
 
     // await self.Manager.libraries.admin.firestore
-    // options.plans.basic = options.plans.basic || {requests: 93};
+    // options.plans.basic = options.plans.basic || {requests: 100};
 
     options.maxUsersStored = options.maxUsersStored || 10000;
     options.refetchInterval = options.refetchInterval || 60;
@@ -89,9 +91,18 @@ ApiManager.prototype.init = function (options) {
 
 ApiManager.prototype._createNewUser = function (authenticatedUser, planId, persistentData, isRefetch, apiKey) {
   const self = this;
+  const _APIManager_default = {
+    stats: {
+      requests: 0,
+    },
+    meta: {
+      lastStatsReset: new Date(),
+      lastUserFetch: new Date(),
+    },
+    providedAPIKey: apiKey,
+  }
   persistentData = persistentData || {};
-  persistentData._meta = persistentData._meta || {};
-  persistentData._stats = persistentData._stats || {};
+  persistentData._APIManager = persistentData._APIManager || merge({}, _APIManager_default);
 
   let newUser = {
     api: get(authenticatedUser, 'api', {}),
@@ -99,36 +110,43 @@ ApiManager.prototype._createNewUser = function (authenticatedUser, planId, persi
     plan: {
       id: planId,
       limits: {
-        requests: get(authenticatedUser, 'plan.limits.requests', get(self.options, `plans.${planId}.limits.requests`, 93)),
       }
     },
     authenticated: authenticatedUser.authenticated,
     ip: authenticatedUser.ip,
     country: authenticatedUser.country,
-    _stats: {
-      requests: 0,
-    },
-    _meta: {
-      lastStatsReset: new Date(),
-      lastUserFetch: new Date(),
-    },
-    _providedAPIKey: apiKey,
+    _APIManager: merge({}, _APIManager_default),
   }
-  // console.log('-----MIN', moment().diff(moment(persistentData._meta.lastStatsReset), 'minutes', true), self.options.resetInterval);
-  if (moment().diff(moment(persistentData._meta.lastStatsReset), 'minutes', true) < self.options.resetInterval) {
-    newUser._meta.lastStatsReset = persistentData._meta.lastStatsReset || newUser._meta.lastStatsReset;
-    newUser._meta.lastUserFetch = persistentData._meta.lastUserFetch || newUser._meta.lastUserFetch;
-    Object.keys(persistentData._stats)
+
+  // Setup newUser
+  const currentPlan = get(self.options, `plans.${planId}.limits`, {})
+  Object.keys(currentPlan)
+  .forEach((id, i) => {
+    // console.log('----id', id);
+    // console.log('======currentPlan[id]', currentPlan[id]);
+    newUser.plan.limits[id] = get(authenticatedUser, `plan.limits.${id}`, currentPlan[id])
+    // const product = data.products[id]
+    // options.plans[product.planId] = {}
+    // options.plans[product.planId].limits = product.limits || {};
+  });
+
+
+
+  // console.log('-----MIN', moment().diff(moment(persistentData._APIManager.meta.lastStatsReset), 'minutes', true), self.options.resetInterval);
+  if (moment().diff(moment(persistentData._APIManager.meta.lastStatsReset), 'minutes', true) < self.options.resetInterval) {
+    newUser._APIManager.meta.lastStatsReset = persistentData._APIManager.meta.lastStatsReset || newUser._APIManager.meta.lastStatsReset;
+    newUser._APIManager.meta.lastUserFetch = persistentData._APIManager.meta.lastUserFetch || newUser._APIManager.meta.lastUserFetch;
+    Object.keys(persistentData._APIManager.stats)
     .forEach((key, i) => {
-      newUser._stats[key] = persistentData._stats[key];
+      newUser._APIManager.stats[key] = persistentData._APIManager.stats[key];
     });
   } else {
     // console.log('---RESSET INTERVAL REACHED');
-    newUser._meta.lastUserFetch = persistentData._meta.lastUserFetch;
+    newUser._APIManager.meta.lastUserFetch = persistentData._APIManager.meta.lastUserFetch;
   }
 
   if (isRefetch) {
-    newUser._meta.lastUserFetch = new Date();
+    newUser._APIManager.meta.lastUserFetch = new Date();
   }
 
   return newUser;
@@ -145,14 +163,14 @@ ApiManager.prototype.getUser = async function (assistant) {
   if (apiKey) {
     newUser = self.userList.filter(user => user.api.privateKey === apiKey);
     if (newUser[0]) {
-      if (newUser.length > 1 || moment().diff(moment(newUser[0]._meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
+      if (newUser.length > 1 || moment().diff(moment(newUser[0]._APIManager.meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
         // console.log('----REFETCHING');
-        persistentData = {set: true, _stats: merge({}, newUser[0]._stats), _meta: merge({}, newUser[0]._meta)};
+        persistentData = {set: true, _APIManager: merge({}, newUser[0]._APIManager)};
 
         self.userList = self.userList.filter(user => user.api.privateKey !== apiKey)
         newUser = null;
       } else {
-        persistentData = {set: true, _stats: merge({}, newUser[0]._stats), _meta: merge({}, newUser[0]._meta)};
+        persistentData = {set: true, _APIManager: merge({}, newUser[0]._APIManager)};
 
         newUser = newUser[0];
       }
@@ -178,10 +196,10 @@ ApiManager.prototype.getUser = async function (assistant) {
     let existingUser = self.userList.find(user => user.auth.uid === workingUID);
     if (existingUser) {
       // console.log('---actually does exist so setting');
-      // console.log('----1111 MIN lastUserFetch', moment().diff(moment(existingUser._meta.lastUserFetch), 'minutes', true), self.options.refetchInterval);
-      persistentData = !persistentData.set ? {set: true, _stats: merge({}, existingUser._stats), _meta: merge({}, existingUser._meta)} : persistentData;
+      // console.log('----1111 MIN lastUserFetch', moment().diff(moment(existingUser._APIManager.meta.lastUserFetch), 'minutes', true), self.options.refetchInterval);
+      persistentData = !persistentData.set ? {set: true, _APIManager: merge({}, existingUser._APIManager)} : persistentData;
       // console.log('----persistentData 2', persistentData);
-      if (moment().diff(moment(existingUser._meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
+      if (moment().diff(moment(existingUser._APIManager.meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
         // console.log('----REFETCHING');
         self.userList = self.userList.filter(user => user.auth.uid !== workingUID)
         existingUser = self._createNewUser(authenticatedUser, planId, persistentData, true, apiKey);
@@ -205,17 +223,40 @@ ApiManager.prototype.getUser = async function (assistant) {
 
 function _getUserStat(self, user, stat, def) {
   const isWhitelistedAPIKey = self.options.whitelistedAPIKeys.includes(
-    get(user, `api.privateKey`, get(user, `_providedAPIKey`))
+    get(user, `api.privateKey`, get(user, `_APIManager.providedAPIKey`))
   );
   // console.log('----user', user);
   // console.log('----isWhitelistedAPIKey', isWhitelistedAPIKey);
   return {
-    current: !isWhitelistedAPIKey ? get(user, `_stats.${stat}`, typeof def !== 'undefined' ? def : 0) : 0,
+    current: !isWhitelistedAPIKey ? get(user, `_APIManager.stats.${stat}`, typeof def !== 'undefined' ? def : 0) : 0,
     limit: !isWhitelistedAPIKey ? get(user, `plan.limits.${stat}`, typeof def !== 'undefined' ? def : 0) : Infinity,
   }
 }
 
-ApiManager.prototype.getUserStat = function (user, stat, def) {
+ApiManager.prototype.isUserOverStat = function (user, stat, def, frame) {
+  const self = this;
+  if (!user || !stat) {
+    throw new Error('<user> and <stat> required')
+  }
+  const result = self.getUserStat(user, stat, def);
+  frame = frame || 'daily';
+  let limit = result.limit;
+  // console.log('---result', result);
+  // console.log('---typeof result.current', typeof result.current);
+  // console.log('----limit', limit);
+  if (typeof result.limit === 'number') {
+    if (frame === 'daily') {
+      limit = Math.floor(result.limit / 31);
+    }
+    // console.log('----limit', limit);
+    // console.log('-----result.current < limit', result.current < limit);
+    return limit >= result.current;
+  }
+
+  return false;
+}
+
+ApiManager.prototype.getUserStat = function (user, stat, def, ) {
   const self = this;
   if (!user || !stat) {
     throw new Error('<user> and <stat> required')
@@ -228,7 +269,7 @@ ApiManager.prototype.incrementUserStat = function (user, stat, amount) {
   if (!user || !stat) {
     throw new Error('<user> and <stat> required')
   }
-  set(user, `_stats.${stat}`, get(user, `_stats.${stat}`, 0) + amount)
+  set(user, `_APIManager.stats.${stat}`, get(user, `_APIManager.stats.${stat}`, 0) + amount)
   return _getUserStat(self, user, stat, 0);
 }
 

package/src/manager/helpers/user.js

@@ -11,7 +11,7 @@ function User(settings, options) {
   options = options || {};
   let now = powertools.timestamp(new Date(), {output: 'string'});
   let nowUNIX = powertools.timestamp(now, {output: 'unix'});
-  let oldDate = powertools.timestamp(new Date('1999/01/01'), {output: 'string'})
+  let oldDate = powertools.timestamp(new Date(0), {output: 'string'})
   let oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
 
   const useDefaults = typeof options.defaults === 'undefined' ? true : options.defaults;
@@ -34,7 +34,7 @@ function User(settings, options) {
         timestampUNIX: _.get(settings, 'plan.expires.timestampUNIX', useDefaults ? oldDateUNIX : null),
       },
       limits: {
-        devices: _.get(settings, 'plan.limits.devices', useDefaults ? 1 : null),
+        // devices: _.get(settings, 'plan.limits.devices', null),
       },
       payment: {
         processor: _.get(settings, 'plan.payment.processor', null), // paypal | stripe | chargebee, etc

package/src/manager/index.js

@@ -90,13 +90,14 @@ Manager.prototype.init = function (exporter, options) {
   }
 
   if (self.options.sentry) {
-    // console.log('Setting up sentry:', `${self.project.projectId}@${self.package.version}`);
-    // console.log('self.config.sentry.dsn', self.config.sentry.dsn);
+    const sentryRelease = `${self.config.app.id || self.project.projectId}@${self.package.version}`;
     const sentryDSN = get(self.config, 'sentry.dsn', '');
+    // console.log('Sentry', sentryRelease, sentryDSN);
+
     self.libraries.sentry = require('@sentry/node');
     self.libraries.sentry.init({
       dsn: sentryDSN,
-      release: `${self.project.projectId}@${self.package.version}`,
+      release: sentryRelease,
       beforeSend(event, hint) {
         if (self.assistant.meta.environment === 'development' && !self.options.reportErrorsInDev) {
           self.assistant.error('Skipping Sentry because DEV')

package/templates/backend-manager-config.json

@@ -1,4 +1,7 @@
 {
+  "app": {
+    "id": "my-app"
+  },
   "brand": {
     "name": "My Brand",
     "url": "https://example.com",