add: env variable and logic to skip email verification

GoodDollar · May 27, 2019 · 8914309 · 8914309
1 parent 71b0dec
commit 8914309
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/.env.dev b/.env.dev
@@ -16,4 +16,5 @@ MAUTIC_TOKEN=""
 ZOOM_API_URL=https://api.zoomauth.com/api/v1/biometrics
 ZOOM_TOKEN=
 ZOOM_MIN_MATCH_LEVEL=1
-ALLOW_DUPLICATE_USER_DATA=true
+ALLOW_DUPLICATE_USER_DATA=true
+SKIP_EMAIL_VERIFICATION=true
diff --git a/.env.example b/.env.example
@@ -29,3 +29,4 @@ GUN_PRIVATE_S3=
 AWS_S3_BUCKET=1
 #allow multiple users to register with same mobile/email - for testing
 ALLOW_DUPLICATE_USER_DATA=true
+SKIP_EMAIL_VERIFICATION=true
diff --git a/src/server/server.config.js b/src/server/server.config.js
@@ -202,6 +202,12 @@ const conf = convict({
     format: Boolean,
     env: 'ALLOW_DUPLICATE_USER_DATA',
     default: false
+  },
+  skipEmailVerification: {
+    doc: 'Allow to register with unverified email',
+    format: Boolean,
+    env: 'SKIP_EMAIL_VERIFICATION',
+    default: false
   }
 })
 

diff --git a/src/server/storage/storageAPI.js b/src/server/storage/storageAPI.js
@@ -20,7 +20,11 @@ const setup = (app: Router, storage: StorageAPI) => {
       const logger = req.log.child({ from: 'storageAPI - /user/add' })
 
       //check that user passed all min requirements
-      if (['production', 'staging'].includes(conf.env) && (!userRecord.smsValidated || !userRecord.isEmailConfirmed))
+      if (
+        ['production', 'staging'].includes(conf.env) &&
+        (userRecord.smsValidated !== true ||
+          (conf.skipEmailVerification === false && userRecord.isEmailConfirmed !== true))
+      )
         throw new Error('User email or mobile not verified!')
 
       const user: UserRecord = defaults(body.user, { identifier: userRecord.loggedInAs })

diff --git a/src/server/verification/verificationAPI.js b/src/server/verification/verificationAPI.js
@@ -156,18 +156,20 @@ const setup = (app: Router, verifier: VerificationAPI, storage: StorageAPI) => {
         userRec.mauticId = mauticContact.contact.fields.all.id
         log.debug('created new user mautic contact', userRec)
       }
-      const code = generateOTP(10)
-      if (!user.isEmailConfirmed) {
-        const validationLink = `${conf.walletUrl}/Signup/EmailConfirmation/?validation=${code}`
-        Mautic.sendVerificationEmail(userRec, validationLink)
-        log.debug('send new user email validation link', validationLink)
+      if (conf.skipEmailVerification === false) {
+        const code = generateOTP(10)
+        if (!user.isEmailConfirmed) {
+          const validationLink = `${conf.walletUrl}/Signup/EmailConfirmation/?validation=${code}`
+          Mautic.sendVerificationEmail(userRec, validationLink)
+          log.debug('send new user email validation link', validationLink)
+        }
+        // updates/adds user with the emailVerificationCode to be used for verification later and with mauticId
+        await storage.updateUser({
+          identifier: user.loggedInAs,
+          mauticId: userRec.mauticId,
+          emailVerificationCode: code
+        })
       }
-      // updates/adds user with the emailVerificationCode to be used for verification later and with mauticId
-      await storage.updateUser({
-        identifier: user.loggedInAs,
-        mauticId: userRec.mauticId,
-        emailVerificationCode: code
-      })
 
       res.json({ ok: 1 })
     })