backend-manager 3.0.62 → 3.0.63

package/package.json

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

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

@@ -23,7 +23,7 @@ Module.prototype.main = function () {
         // Get auth user from firebase
         const ip = assistant.request.geolocation.ip;
         const authUser = await Manager.libraries.admin.auth().getUser(user.auth.uid).catch(e => e);
-        const usage = await Manager.Usage().init(assistant, {log: true, localKey: ip});
+        const usage = await Manager.Usage().init(assistant, {log: true, key: ip});
 
         if (authUser instanceof Error) {
           return reject(assistant.errorManager(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}).error)

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

@@ -31,6 +31,8 @@ Module.prototype.main = function () {
 
     assistant.log(`Request: ${user.uid}`, user, context);
 
+    // TODO: ⛔️⛔️⛔️ UTILIZE THE NEW .usage() system (similar to src/manager/functions/core/actions/api/user/sign-up.js)
+
     // if (context.additionalUserInfo.recaptchaScore < 0.5) {
     //   assistant.error(`Recaptcha score (${context.additionalUserInfo.recaptchaScore}) too low for ${user.uid}`);
 

package/src/manager/helpers/usage.js

@@ -41,7 +41,8 @@ Usage.prototype.init = function (assistant, options) {
     options.refetch = typeof options.refetch === 'undefined' ? false : options.refetch;
     options.clear = typeof options.clear === 'undefined' ? false : options.clear;
     options.today = typeof options.today === 'undefined' ? undefined : options.today;
-    options.localKey = typeof options.localKey === 'undefined' ? undefined : options.localKey;
+    options.key = typeof options.key === 'undefined' ? undefined : options.key;
+    options.unauthenticatedMode = typeof options.unauthenticatedMode === 'undefined' ? 'firestore' : options.unauthenticatedMode;
     options.log = typeof options.log === 'undefined' ? false : options.log;
 
     // Check for required options
@@ -59,11 +60,11 @@ Usage.prototype.init = function (assistant, options) {
     self.storage = Manager.storage({name: 'usage', temporary: true, clear: options.clear, log: options.log});
 
     // Set local key
-    const localKey = (options.localKey || self.assistant.request.geolocation.ip || '')
+    self.key = (options.key || self.assistant.request.geolocation.ip || '')
       .replace(/[\.:]/g, '_');
 
     // Set paths
-    self.paths.user = `users.${localKey}`;
+    self.paths.user = `users.${self.key}`;
     self.paths.app = `apps.${options.app}`;
 
     // Get storage data
@@ -73,10 +74,26 @@ Usage.prototype.init = function (assistant, options) {
     // Authenticate user (user will be resolved as well)
     self.user = await assistant.authenticate();
 
-    // Replce with local if no user
-    if (!self.user.auth.uid) {
-      const existingLocal = self.storage.get(self.paths.user, {}).value();
-      self.user.usage = existingLocal && existingLocal.usage ? existingLocal.usage : self.user.usage;
+    self.useUnauthenticatedStorage = !self.user.auth.uid || self.options.key;
+
+    // Load usage with temporary if unauthenticated
+    if (self.useUnauthenticatedStorage) {
+      let foundUsage;
+
+      if (options.unauthenticatedMode === 'firestore') {
+        foundUsage = await Manager.libraries.admin.firestore().doc(`temporary/usage`)
+          .get()
+          .then((r) => {
+            return r.data()?.[`${self.key}`];
+          })
+          .catch((e) => {
+            assistant.errorManager(`Usage.init(): Error fetching usage data: ${e}`, {sentry: true, send: false, log: true});
+          });
+      } else {
+        foundUsage = self.storage.get(`${self.paths.user}.usage`, {}).value();
+      }
+
+      self.user.usage = foundUsage ? foundUsage : self.user.usage;
     }
 
     // Log
@@ -209,7 +226,7 @@ Usage.prototype.set = function (path, value) {
   const assistant = self.assistant;
 
   // Update total and period
-  const resolved = `usage.${path}.${key}`;
+  const resolved = `usage.${path}.period`;
 
   value = value || 0;
 
@@ -245,11 +262,29 @@ Usage.prototype.update = function () {
     const Manager = self.Manager;
     const assistant = self.assistant;
 
-    // Write self.user to firestore or local if no user or if localKey is set
-    if (
-      self.user.auth.uid
-      && !self.options.localKey
-    ) {
+    // Write self.user to firestore or local if no user or if key is set
+    if (self.useUnauthenticatedStorage) {
+      if (self.options.unauthenticatedMode === 'firestore') {
+        Manager.libraries.admin.firestore().doc(`temporary/usage`)
+          .set({
+            [`${self.key}`]: self.user.usage,
+          }, {merge: true})
+          .then(() => {
+            self.log(`Usage.update(): Updated user.usage in firestore`, self.user.usage);
+
+            return resolve();
+          })
+          .catch(e => {
+            return reject(assistant.errorManager(e, {sentry: true, send: false, log: false}));
+          });
+      } else {
+        self.storage.set(`${self.paths.user}.usage`, self.user.usage).write();
+
+        self.log(`Usage.update(): Updated user.usage in local storage`, self.user.usage);
+
+        return resolve();
+      }
+    } else {
       Manager.libraries.admin.firestore().doc(`users/${self.user.auth.uid}`)
         .set({
           usage: self.user.usage,
@@ -262,12 +297,6 @@ Usage.prototype.update = function () {
         .catch(e => {
           return reject(assistant.errorManager(e, {sentry: true, send: false, log: false}));
         });
-    } else {
-      self.storage.set(`${self.paths.user}.usage`, self.user.usage).write();
-
-      self.log(`Usage.update(): Updated user.usage in local storage`, self.user.usage);
-
-      return resolve();
     }
   });
 };