wip to squash into enter mfa

Author: alhcomer

src/components/enter-mfa/enter-mfa-controller.ts

@@ -88,7 +88,7 @@ export function enterMfaTemplateParametersFromRequest(req: Request): any {
   const hasMultipleMfaMethods = req.session.user.mfaMethods?.length > 1;
 
   return {
-    phoneNumber: activeMfaMethod.phoneNumber,
+    phoneNumber: activeMfaMethod.redactedPhoneNumber,
     isAccountRecoveryPermitted: req.session.user.isAccountRecoveryPermitted,
     hasMultipleMfaMethods,
     mfaIssuePath: hasMultipleMfaMethods

src/components/enter-mfa/tests/enter-mfa-controller.test.ts

@@ -47,7 +47,7 @@ describe("enter mfa controller", () => {
 
     req.session.user.mfaMethods = buildMfaMethods({
       id: TEST_DEFAULT_MFA_ID,
-      phoneNumber: TEST_PHONE_NUMBER,
+      redactedPhoneNumber: TEST_PHONE_NUMBER,
     });
     res.render = sinon.spy(res.render);
   });

src/components/enter-mfa/tests/enter-mfa-integration.test.ts

@@ -28,12 +28,16 @@ describe("Integration:: enter mfa", () => {
   let baseApi: string;
   const DEFAULT_PHONE_NUMBER = "7867";
   const BACKUP_PHONE_NUMBER = "1234";
+  const DEFAULT_PHONE_NUMBER_ID = "test-id";
+  const BACKUP_PHONE_NUMBER_ID = "test-id-backup";
 
   async function setupStubbedApp(
     partialMfaMethods: {
       redactedPhoneNumber?: string;
+      id: string;
     }[] = [
       {
+        id: DEFAULT_PHONE_NUMBER_ID,
         redactedPhoneNumber: DEFAULT_PHONE_NUMBER,
       },
     ],
@@ -54,6 +58,7 @@ describe("Integration:: enter mfa", () => {
             req.session.user = {
               email: "test@test.com",
               mfaMethods: buildMfaMethods(partialMfaMethods),
+              activeMfaMethodId: DEFAULT_PHONE_NUMBER_ID,
               journey: getPermittedJourneyForPath(PATH_NAMES.ENTER_MFA),
             };
             next();
@@ -128,6 +133,7 @@ describe("Integration:: enter mfa", () => {
       partialMfaMethods: [
         {
           redactedPhoneNumber: DEFAULT_PHONE_NUMBER,
+          id: DEFAULT_PHONE_NUMBER_ID,
         },
       ],
       isAccountRecoveryPermitted: false,
@@ -137,6 +143,7 @@ describe("Integration:: enter mfa", () => {
       partialMfaMethods: [
         {
           redactedPhoneNumber: DEFAULT_PHONE_NUMBER,
+          id: DEFAULT_PHONE_NUMBER_ID,
         },
       ],
       isAccountRecoveryPermitted: true,
@@ -149,9 +156,11 @@ describe("Integration:: enter mfa", () => {
       partialMfaMethods: [
         {
           redactedPhoneNumber: DEFAULT_PHONE_NUMBER,
+          id: DEFAULT_PHONE_NUMBER_ID,
         },
         {
-          redactedPhoneNumber: BACKUP_PHONE_NUMBER,
+          authApp: BACKUP_PHONE_NUMBER,
+          id: BACKUP_PHONE_NUMBER_ID,
         },
       ],
       isAccountRecoveryPermitted: true,