fix(KYC): fixed user creation flow

blockchain · Dec 16, 2018 · dcfe62c · dcfe62c
1 parent df9ac92
commit dcfe62c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 32 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/index.js b/packages/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/index.js
@@ -180,9 +180,9 @@ TierCard.defaultProps = {
   outsideOfProfile: false
 }
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch, { tier }) => ({
   verifyIdentity: () =>
-    dispatch(actions.components.identityVerification.verifyIdentity())
+    dispatch(actions.components.identityVerification.verifyIdentity(tier))
 })
 
 export default connect(

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/identityVerification/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/identityVerification/sagas.js
@@ -46,6 +46,7 @@ export default ({ api, coreSagas }) => {
   const { USER_ACTIVATION_STATES, TIERS } = model.profile
   const {
     getCampaignData,
+    fetchUser,
     createUser,
     updateUser,
     generateRetailToken,
@@ -62,7 +63,8 @@ export default ({ api, coreSagas }) => {
     const campaignData = yield call(getCampaignData, campaign)
     const token = (yield select(
       selectors.modules.profile.getApiToken
-    )).getOrFail()
+    )).getOrElse(null)
+    if (!token) return
     try {
       yield call(
         api.registerUserCampaign,
@@ -83,9 +85,7 @@ export default ({ api, coreSagas }) => {
 
   const createRegisterUserCampaign = function*() {
     try {
-      const userWithEmailExists = yield call(verifyIdentity)
-      if (userWithEmailExists) return
-      yield call(createUser)
+      yield call(verifyIdentity)
       yield call(registerUserCampaign, { newUser: true })
     } catch (e) {
       yield put(
@@ -103,32 +103,34 @@ export default ({ api, coreSagas }) => {
     if (selected === tier)
       return yield put(actions.analytics.logKycEvent(REENTERED))
     yield call(api.selectTier, tier)
+    yield call(fetchUser)
     yield put(actions.analytics.logKycEvent(STARTED))
   }
 
-  const checkUserExistance = function*() {
+  const checkUserUniqueness = function*() {
     const userId = (yield select(
       selectors.core.kvStore.userCredentials.getUserId
     )).getOrElse('')
 
-    if (userId) return false
+    if (userId) return true
     try {
       const retailToken = yield call(generateRetailToken)
       yield call(api.checkUserExistence, retailToken)
-      return true
-    } catch (e) {
       return false
+    } catch (e) {
+      return true
     }
   }
 
   const verifyIdentity = function*({ payload }) {
     const { tier } = payload
-    const userExists = yield call(checkUserExistance)
-    if (userExists) {
+    const unique = yield call(checkUserUniqueness)
+    if (!unique) {
       yield put(actions.modals.showModal(USER_EXISTS_MODAL))
       return yield put(actions.analytics.logKycEvent(EMAIL_EXISTS))
     }
     try {
+      yield call(createUser)
       yield call(selectTier, tier)
       yield put(actions.modals.showModal(KYC_MODAL, { desiredTier: tier }))
     } catch (e) {
@@ -251,7 +253,6 @@ export default ({ api, coreSagas }) => {
   const savePersonalData = function*() {
     try {
       yield put(actions.form.startSubmit(PERSONAL_FORM))
-      yield call(createUser)
       const {
         firstName,
         lastName,

diff --git a/...ages/blockchain-wallet-v4-frontend/src/data/components/identityVerification/sagas.spec.js b/...ages/blockchain-wallet-v4-frontend/src/data/components/identityVerification/sagas.spec.js
@@ -16,7 +16,6 @@ const api = {
 const coreSagas = {}
 
 const {
-  createUser,
   checkKycFlow,
   createRegisterUserCampaign,
   goToNextStep,
@@ -203,28 +202,14 @@ describe('checkKycFlow saga', () => {
 })
 
 describe('createRegisterUserCampaign', () => {
-  it('should return if user exists', () => {
+  it('should call verify identity and register user campaign', () => {
     const saga = testSaga(createRegisterUserCampaign)
     saga
       .next()
       .call(verifyIdentity)
-      .next(true)
+      .next()
+      .call(registerUserCampaign, { newUser: true })
+      .next()
       .isDone()
   })
-  describe('should get user id if user needs verification', () => {
-    const saga = testSaga(createRegisterUserCampaign)
-    it('should attempt to verify id', () => {
-      saga.next().call(verifyIdentity)
-    })
-    it('should createUser', () => {
-      saga.next(false).call(createUser)
-    })
-    it('should register user campaign', () => {
-      saga
-        .next()
-        .call(registerUserCampaign, { newUser: true })
-        .next()
-        .isDone()
-    })
-  })
 })