Update verificationAPI.js

GoodDollar · May 27, 2020 · f8037c4 · f8037c4
1 parent be17c67
commit f8037c4
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/server/verification/verificationAPI.js b/src/server/verification/verificationAPI.js
@@ -1,7 +1,7 @@
 // @flow
 import { Router } from 'express'
 import passport from 'passport'
-import _ from 'lodash'
+import { get, defaults } from 'lodash'
 import moment from 'moment'
 import type { LoggedUser, StorageAPI, UserRecord, VerificationAPI } from '../../imports/types'
 import AdminWallet from '../blockchain/AdminWallet'
@@ -71,7 +71,7 @@ const setup = (app: Router, verifier: VerificationAPI, storage: StorageAPI) => {
       let enrollmentResult
 
       try {
-        const { skipFaceVerification } = conf
+        const { skipFaceVerification, claimQueueAllowed } = conf
         const enrollmentProcessor = createEnrollmentProcessor(storage)
 
         enrollmentProcessor.validate(user, enrollmentIdentifier, payload)
@@ -112,10 +112,13 @@ const setup = (app: Router, verifier: VerificationAPI, storage: StorageAPI) => {
             }
           }
         } else {
-          //only approved users can do the process
-          const isApprovedToClaim = user.claimQueue && ['approved', 'whitelisted'].includes(user.claimQueue.status)
-          if (conf.claimQueueAllowed > 0 && isApprovedToClaim === false)
+          const isApprovedToClaim = ['approved', 'whitelisted'].includes(get(user, 'claimQueue.status'))
+
+          // only approved users can do the process
+          if (claimQueueAllowed && !isApprovedToClaim) {
             throw new Error('User not approved to claim, not in queue or still pending')
+          }
+
           enrollmentResult = await enrollmentProcessor.enroll(user, enrollmentIdentifier, payload, log)
         }
       } catch (exception) {
@@ -153,7 +156,7 @@ const setup = (app: Router, verifier: VerificationAPI, storage: StorageAPI) => {
 
       const mobile = body.user.mobile || user.otp.mobile
 
-      let userRec: UserRecord = _.defaults(body.user, user, { identifier: user.loggedInAs })
+      let userRec: UserRecord = defaults(body.user, user, { identifier: user.loggedInAs })
       const savedMobile = user.mobile
 
       if (conf.allowDuplicateUserData === false && (await storage.isDupUserData({ mobile }))) {
@@ -320,7 +323,7 @@ const setup = (app: Router, verifier: VerificationAPI, storage: StorageAPI) => {
       const { email } = body.user
 
       //merge user details for use by mautic
-      let userRec: UserRecord = _.defaults(body.user, user)
+      let userRec: UserRecord = defaults(body.user, user)
       const currentEmail = user.email
       const tempMauticId = user.otp && user.otp.tempMauticId