backend-manager 3.0.46 → 3.0.48

package/package.json

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

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

@@ -14,23 +14,21 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
     self.Api.resolveUser({adminRequired: true})
     .then(async (user) => {
-      // const planExpireDate = new Date(_.get(payload.user, 'plan.expires.timestamp', 0));
-      // if (planExpireDate >= new Date()) {
-      //   payload.response.status = 401;
-      //   payload.response.error = new Error(`Failed to delete user: There is an active paid subscription on this account. Please cancel it first and then try deleting the account again.`);
-      //   return reject(payload.response.error);
-      // }
-
       // Disallow deleting users with subscriptions in any state other than cancelled or active payments
       if (
         (user?.plan?.status && user?.plan?.status !== 'cancelled')
         || user?.plan?.payment?.active
       ) {
-        // return reject(assistant.errorManager(`Failed to delete user: There is an active paid subscription on this account. Please cancel it first and then try deleting the account again.`, {code: 400, sentry: false, send: false, log: false}).error)
-        // return reject(assistant.errorManager(`This account cannot be deleted until the paid subscription attached to it is cancelled. Please cancel the subscription and then try to delete the account.`, {code: 400, sentry: false, send: false, log: false}).error)
         return reject(assistant.errorManager(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}).error)
       }
 
+      // Signout of all sessions
+      await Api.import('user:sign-out-all-sessions')
+      .then(async (lib) => {
+        await lib.main().catch(e => e);
+      })
+
+      // Perform the delete
       await self.libraries.admin.auth().deleteUser(_.get(user, 'auth.uid', null))
       .then(() => {
         return resolve({data: {success: true}});

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

@@ -17,20 +17,37 @@ Module.prototype.main = function () {
     self.Api.resolveUser({adminRequired: true})
     .then(async (user) => {
         // Get auth user from firebase
-        const authUser = await self.libraries.admin.auth().getUser(user.auth.uid).catch(e => e);
+        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});
 
         if (authUser instanceof Error) {
           return reject(assistant.errorManager(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}).error)
         }
 
-        // Difference in hours
-        const diff = (Date.now() - new Date(authUser.metadata.creationTime)) / 36e5;
+        // Difference in minutes
+        const ageInMinutes = (Date.now() - new Date(authUser.metadata.creationTime)) / 1000 / 60;
 
         // If the user is not new, reject
-        if (diff > 0.5) {
+        if (ageInMinutes > 3) {
           return reject(assistant.errorManager(`User is not new.`, {code: 400, sentry: false, send: false, log: false}).error)
         }
 
+        // Check if IP has signed up too many times
+        const signups = usage.getUsage('signups');
+
+        // If over limit, reject and delete the user
+        if (signups >= 3) {
+          await Api.import('user:delete')
+            .then(async (lib) => {
+              await lib.main().catch(e => e);
+            })
+          return reject(assistant.errorManager(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}).error)
+        }
+
+        // Increment signups
+        usage.increment('signups');
+
         await self.signUp({
           auth: {
             uid: _.get(user, 'auth.uid', null),
@@ -78,7 +95,7 @@ Module.prototype.signUp = function (payload) {
 
     const result = {
       signedUp: false,
-      referrerUid: undefined,
+      referrerUid: null,
       // updatedReferral: true,
     };
 
@@ -146,7 +163,7 @@ Module.prototype.updateReferral = function (payload) {
     const result = {
       count: 0,
       updatedReferral: false,
-      referrerUid: undefined,
+      referrerUid: null,
     }
     payload = payload || {};
 
@@ -181,7 +198,7 @@ Module.prototype.updateReferral = function (payload) {
           await self.libraries.admin.firestore().doc(`users/${doc.ref.id}`)
           .set({
             affiliate: {
-              referrals: referrals
+              referrals: referrals,
             }
           }, {merge: true})
           .catch(e => {
@@ -192,7 +209,7 @@ Module.prototype.updateReferral = function (payload) {
 
           result.count = count;
           result.updatedReferral = true;
-          result.referrerUid = doc.ref.id
+          result.referrerUid = doc.ref.id;
           found = true
         }
       }

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

@@ -1,4 +1,4 @@
-const { get } = require('lodash');
+const { get, merge } = require('lodash');
 
 function Module() {
   const self = this;
@@ -37,22 +37,17 @@ Module.prototype.main = function () {
       assistant.error(`Failed to get existing user ${user.uid}:`, existingUser, { environment: 'production' });
 
       return reject(existingUser);
-    } else if (
-      get(existingUser, 'auth.uid', null)
-      || get(existingUser, 'auth.email', null)
-    ) {
-      assistant.log(`Skipping handler because user already exists ${user.uid}:`, existingUser);
-
-      return resolve(self);
     }
 
     // Build user object
-    const newUser = self.Manager.User({
+    let newUser = self.Manager.User().properties;
+
+    newUser = merge(newUser, existingUser, {
       auth: {
         uid: user.uid,
         email: user.email,
-      }
-    }).properties;
+      },
+    });
 
     // Set up analytics
     const analytics = self.Manager.Analytics({

package/src/manager/helpers/usage.js

@@ -128,7 +128,7 @@ Usage.prototype.validate = function (path, options) {
     options.useCaptchaResponse = typeof options.useCaptchaResponse === 'undefined' ? true : options.useCaptchaResponse;
 
     // Check for required options
-    const period = self.getUsage(path)
+    const period = self.getUsage(path);
     const allowed = self.getLimit(path);
 
     // Log
@@ -238,8 +238,11 @@ Usage.prototype.update = function () {
     const Manager = self.Manager;
     const assistant = self.assistant;
 
-    // Write self.user to firestore or local if no user
-    if (self.user.auth.uid) {
+    // Write self.user to firestore or local if no user or if localKey is set
+    if (
+      self.user.auth.uid
+      && !self.options.localKey
+    ) {
       Manager.libraries.admin.firestore().doc(`users/${self.user.auth.uid}`)
         .set({
           usage: self.user.usage,