AUT-4248: Send activeMfaMethodId in send-mfa-controller

Author: alhcomer

src/components/common/mfa/send-mfa-controller.ts

@@ -69,7 +69,7 @@ export function sendMfaGeneric(
   mfaCodeService: MfaServiceInterface
 ): ExpressRouteFunc {
   return async function (req: Request, res: Response) {
-    const { email } = req.session.user;
+    const { email, activeMfaMethodId } = req.session.user;
     const { sessionId, clientSessionId, persistentSessionId } = res.locals;
     const isResendCodeRequest: boolean = req.body.isResendCodeRequest;
 
@@ -81,6 +81,7 @@ export function sendMfaGeneric(
       isResendCodeRequest,
       xss(req.cookies.lng as string),
       req,
+      activeMfaMethodId,
       getJourneyTypeFromUserSession(req.session.user, {
         includeReauthentication: true,
       })

src/components/common/mfa/tests/send-mfa-controller.test.ts

@@ -12,7 +12,7 @@ import * as journey from "../../journey/journey.js";
 import { createMockRequest } from "../../../../../test/helpers/mock-request-helper.js";
 import esmock from "esmock";
 import type { SinonSpy } from "sinon";
-import type { ExpressRouteFunc } from "../../../../types";
+import type { ExpressRouteFunc } from "../../../../types.js";
 
 describe("send mfa controller", () => {
   let req: RequestOutput;
@@ -47,7 +47,7 @@ describe("send mfa controller", () => {
   });
 
   describe("sendMfaGeneric", () => {
-    it("can send the journeyType when requesting the code", async () => {
+    it("can send the journeyType and activeMfaMethodId when requesting the code", async () => {
       const fakeService: MfaServiceInterface = {
         sendMfaCode: sinon.fake.returns({
           success: true,
@@ -58,6 +58,7 @@ describe("send mfa controller", () => {
       req.session.user = {
         email: "test@test.com",
         reauthenticate: "test_data",
+        activeMfaMethodId: "active_mfa_method_id",
       };
       req.path = PATH_NAMES.RESEND_MFA_CODE;
 
@@ -79,6 +80,7 @@ describe("send mfa controller", () => {
         sinon.match.any,
         sinon.match.any,
         sinon.match.any,
+        "active_mfa_method_id",
         JOURNEY_TYPE.REAUTHENTICATION
       );
     });
@@ -122,6 +124,7 @@ describe("send mfa controller", () => {
         sinon.match.any,
         sinon.match.any,
         sinon.match.any,
+        sinon.match.any,
         undefined
       );
     });
@@ -165,6 +168,7 @@ describe("send mfa controller", () => {
         sinon.match.any,
         sinon.match.any,
         sinon.match.any,
+        sinon.match.any,
         JOURNEY_TYPE.REAUTHENTICATION
       );
     });