Introduce urrentVerifyFlow to clarify verification logic

Author: crisnicandrei

src/app/auth/components/verify/verify.component.spec.ts

@@ -236,4 +236,19 @@ describe('VerifyComponent', () => {
     expect(component.captchaPassed).toBeTruthy();
     expect(component.canSendCodes('phone')).toBeTruthy();
   });
+
+  it('should set flow to email when only email is unverified', async () => {
+    await init(defaultAuthData, { sendEmail: true });
+
+    expect(component.currentVerifyFlow).toBe('email');
+    expect(component.formTitle).toBe('Verify Email');
+  });
+
+  it('should set flow to phone when only phone is unverified', async () => {
+    const unverifiedPhoneData = require('@root/test/responses/auth.verify.unverifiedPhone.success.json');
+    await init(unverifiedPhoneData, { sendSms: true });
+
+    expect(component.currentVerifyFlow).toBe('phone');
+    expect(component.formTitle).toBe('Verify Phone Number');
+  });
 });

src/app/auth/components/verify/verify.component.ts

@@ -30,6 +30,8 @@ export class VerifyComponent implements OnInit {
   verifyingEmail = true;
   verifyingPhone = false;
 
+  currentVerifyFlow: 'none' | 'email' | 'phone' = 'none';
+
   needsEmail: boolean;
   needsPhone: boolean;
 
@@ -62,10 +64,19 @@ export class VerifyComponent implements OnInit {
     }
     const queryParams = route.snapshot.queryParams;
 
-    this.needsEmail =
-      (account.emailNeedsVerification() || queryParams.sendEmail) &&
-      !queryParams.sendSms;
-    this.needsPhone = account.phoneNeedsVerification() || queryParams.sendSms;
+    this.needsEmail = account.emailNeedsVerification();
+    this.needsPhone = account.phoneNeedsVerification();
+
+    if ((this.needsEmail || queryParams.sendEmail) && !queryParams.sendSms) {
+      this.currentVerifyFlow = 'email';
+    } else if (
+      (this.needsPhone || queryParams.sendSms) &&
+      !queryParams.sendEmail
+    ) {
+      this.currentVerifyFlow = 'phone';
+    } else {
+      this.currentVerifyFlow = 'none';
+    }
 
     this.verifyForm = fb.group({
       token: [queryParams.token || ''],
@@ -99,12 +110,15 @@ export class VerifyComponent implements OnInit {
       }
     }
 
-    if (!this.needsEmail && this.needsPhone) {
-      this.verifyingEmail = false;
-      this.verifyingPhone = true;
-      this.formTitle = 'Verify Phone Number';
-    } else if (!this.needsEmail) {
-      this.router.navigate(['/private'], { queryParamsHandling: 'preserve' });
+    switch (this.currentVerifyFlow) {
+      case 'phone':
+        this.verifyingEmail = false;
+        this.verifyingPhone = true;
+        this.formTitle = 'Verify Phone Number';
+        break;
+      case 'none':
+        this.router.navigate(['/private'], { queryParamsHandling: 'preserve' });
+        break;
     }
   }