backend-manager 3.0.49 → 3.0.50

package/package.json

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

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

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const fetch = require('node-fetch');
 
 const MAX_SIGNUPS = 3;
-const MAX_AGE = 3;
+const MAX_AGE = 30;
 
 function Module() {
 
@@ -28,11 +28,11 @@ Module.prototype.main = function () {
           return reject(assistant.errorManager(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}).error)
         }
 
-        // Difference in minutes
-        const ageInMinutes = (Date.now() - new Date(authUser.metadata.creationTime)) / 1000 / 60;
+        // Age in seconds
+        const ageInSeconds = (Date.now() - new Date(authUser.metadata.creationTime)) / 1000;
 
         // If the user is not new, reject
-        if (ageInMinutes >= MAX_AGE) {
+        if (ageInSeconds >= MAX_AGE) {
           return reject(assistant.errorManager(`User is not new.`, {code: 400, sentry: false, send: false, log: false}).error)
         }
 

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

@@ -41,14 +41,14 @@ let Module = {
       if (!payload.title || !payload.body) {
         response.status = 400;
         response.error = new Error('Not enough notification parameters supplied.');
-        assistant.error(response.error, { environment: 'production' })
+        assistant.error(response.error)
         return res.status(response.status).send(response.error.message);
       }
 
       if (!user.roles.admin) {
         response.status = 401;
         response.error = new Error('Unauthenticated, admin required.');
-        assistant.error(response.error, { environment: 'production' })
+        assistant.error(response.error)
         return res.status(response.status).send(response.error.message);
       } else {
         await self.getTokens({tags: false});

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

@@ -29,10 +29,10 @@ Module.prototype.main = function () {
     const admin = self.libraries.admin;
     const storage = self.Manager.storage({ temporary: true, name: 'rate-limiting' });
 
-    assistant.log(`Request: ${user.uid}`, user, context, { environment: 'production' });
+    assistant.log(`Request: ${user.uid}`, user, context);
 
     // if (context.additionalUserInfo.recaptchaScore < 0.5) {
-    //   assistant.error(`Recaptcha score (${context.additionalUserInfo.recaptchaScore}) too low for ${user.uid}`, { environment: 'production' });
+    //   assistant.error(`Recaptcha score (${context.additionalUserInfo.recaptchaScore}) too low for ${user.uid}`);
 
     //   throw new functions.auth.HttpsError('resource-exhausted', ERROR_TOO_MANY_ATTEMPTS);
     // }
@@ -46,10 +46,10 @@ Module.prototype.main = function () {
     const count = get(rateLimitingData, 'count', 0);
     const lastTime = get(rateLimitingData, 'lastTime', 0);
 
-    assistant.log(`Rate limiting for ${ipAddress}:`, rateLimitingData, { environment: 'production' });
+    assistant.log(`Rate limiting for ${ipAddress}:`, rateLimitingData);
 
     if (currentTime - lastTime < oneHour && count >= 2) {
-      assistant.error(`Too many attemps to create an account for ${ipAddress}`, { environment: 'production' });
+      assistant.error(`Too many attemps to create an account for ${ipAddress}`);
 
       throw new functions.auth.HttpsError('resource-exhausted', ERROR_TOO_MANY_ATTEMPTS);
     }
@@ -64,7 +64,7 @@ Module.prototype.main = function () {
 
     // If user already exists, skip auth-on-create handler
     if (existingAccount instanceof Error) {
-      assistant.error(`Failed to get existing account ${user.uid}:`, existingAccount, { environment: 'production' });
+      assistant.error(`Failed to get existing account ${user.uid}:`, existingAccount);
 
       throw new functions.auth.HttpsError('internal', `Failed to get existing account: ${existingAccount}`);
     }
@@ -109,12 +109,12 @@ Module.prototype.main = function () {
       .set(account, { merge: true });
 
     if (update instanceof Error) {
-      assistant.error(`Failed to update user ${user.uid}:`, update, { environment: 'production' });
+      assistant.error(`Failed to update user ${user.uid}:`, update);
 
       throw new functions.auth.HttpsError('internal', `Failed to update user: ${update}`);
     }
 
-    assistant.log(`User created at users/${user.uid}`, account, { environment: 'production' });
+    assistant.log(`User created at users/${user.uid}`, account);
 
     return resolve(self);
   });

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

@@ -49,7 +49,7 @@ Module.prototype.main = function () {
       }, { merge: true });
 
     if (update instanceof Error) {
-      assistant.error(`Failed to update user ${user.uid}:`, update, { environment: 'production' });
+      assistant.error(`Failed to update user ${user.uid}:`, update);
 
       throw new functions.auth.HttpsError('internal', `Failed to update user: ${update}`);
     }

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

@@ -1,4 +1,7 @@
 const { get, merge } = require('lodash');
+const powertools = require('node-powertools');
+
+const MAX_AGE = 30;
 
 function Module() {
   const self = this;
@@ -23,18 +26,36 @@ Module.prototype.main = function () {
   const context = self.context;
 
   return new Promise(async function(resolve, reject) {
-    assistant.log(`Request: ${user.uid}`, user, context, { environment: 'production' });
+    assistant.log(`Request: ${user.uid}`, user, context);
+
+    const ageInSeconds = (Date.now() - new Date(user.metadata.creationTime)) / 1000;
 
     // Check if exists already
     // It could exist already if user signed up with email and then signed in with Google
-    const existingUser = await libraries.admin.firestore().doc(`users/${user.uid}`)
-      .get()
-      .then((doc) => doc.data() || {})
-      .catch(e => e)
+    let existingUser;
+    await powertools.poll(async () => {
+      assistant.log(`Polling for existing user ${user.uid}...`);
+      existingUser = await libraries.admin.firestore().doc(`users/${user.uid}`)
+        .get()
+        .then((doc) => doc.data())
+        .catch(e => e);
+
+        return existingUser && !(existingUser instanceof Error);
+    }, {interval: 1000, timeout: 30000})
+    .catch(e => {
+      existingUser = e;
+      assistant.error(`Timeout for existing user expired`, e);
+    });
+
+    assistant.log(`Existing user ${user.uid} found (age=${ageInSeconds}):`, existingUser);
+
+    if (ageInSeconds >= MAX_AGE) {
+      existingUser = new Error(`User is not new (age=${ageInSeconds}).`);
+    }
 
     // If user already exists, skip auth-on-create handler
     if (existingUser instanceof Error) {
-      assistant.error(`Failed to get existing user ${user.uid}:`, existingUser, { environment: 'production' });
+      assistant.error(`Failed to get existing user ${user.uid}:`, existingUser);
 
       return reject(existingUser);
     }

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

@@ -21,7 +21,7 @@ Module.prototype.main = function () {
   const context = self.context;
 
   return new Promise(async function(resolve, reject) {
-    assistant.log(`Request: ${user.uid}`, user, context, { environment: 'production' });
+    assistant.log(`Request: ${user.uid}`, user, context);
 
     // Set up analytics
     const analytics = self.Manager.Analytics({