Merge pull request #841 from govuk-one-login/ATO-925-fix-double-email…

…-entry-bug ATO-925: Fix double email entry bug
govuk-one-login · Aug 7, 2024 · 741f73c · 741f73c
2 parents 49b7315 + df56d98
commit 741f73c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/express/src/controllers/register.ts b/express/src/controllers/register.ts
@@ -19,6 +19,7 @@ export const processGetEmailForm: RequestHandler = async (req, res) => {
     console.info("In ProcessGetEmailForm");
 
     req.session.emailAddress = emailAddress;
+    req.session.save();
 
     try {
         await s4.createUser(emailAddress);

diff --git a/express/tests/controllers/register.test.ts b/express/tests/controllers/register.test.ts
@@ -82,6 +82,7 @@ describe("processGetEmailForm controller tests", () => {
 
         await processGetEmailForm(mockReq, mockRes, mockNext);
         expect(s4CreateUserSpy).toHaveBeenCalledWith(TEST_EMAIL);
+        expect(mockReq.session.save).toHaveBeenCalled();
         expect(mockRes.redirect).toHaveBeenCalledWith("/register/enter-email-code");
     });
 
@@ -106,6 +107,7 @@ describe("processGetEmailForm controller tests", () => {
         await processGetEmailForm(mockReq, mockRes, mockNext);
         expect(s4CreateUserSpy).toHaveBeenCalledWith(TEST_EMAIL);
         expect(s4SignUpStatusSpy).toHaveBeenCalledWith(TEST_EMAIL);
+        expect(mockReq.session.save).toHaveBeenCalled();
         expect(console.info).toHaveBeenCalledWith("Processing No HasEMail");
         expect(mockRes.redirect).toHaveBeenCalledWith("resume-before-password");
     });
@@ -134,6 +136,7 @@ describe("processGetEmailForm controller tests", () => {
         expect(s4CreateUserSpy).toHaveBeenCalledWith(TEST_EMAIL);
         expect(s4SignUpStatusSpy).toHaveBeenCalledWith(TEST_EMAIL);
         expect(console.info).toHaveBeenCalledWith("Processing No HasPassword");
+        expect(mockReq.session.save).toHaveBeenCalled();
         expect(mockRes.redirect).toHaveBeenCalledWith("resume-before-password");
     });
 
@@ -162,6 +165,7 @@ describe("processGetEmailForm controller tests", () => {
         expect(s4CreateUserSpy).toHaveBeenCalledWith(TEST_EMAIL);
         expect(s4SignUpStatusSpy).toHaveBeenCalledWith(TEST_EMAIL);
         expect(console.info).toHaveBeenCalledWith("Processing No HasPhoneNumber");
+        expect(mockReq.session.save).toHaveBeenCalled();
         expect(mockRes.redirect).toHaveBeenCalledWith("resume-after-password");
     });
 
@@ -190,6 +194,7 @@ describe("processGetEmailForm controller tests", () => {
         await processGetEmailForm(mockReq, mockRes, mockNext);
         expect(s4CreateUserSpy).toHaveBeenCalledWith(TEST_EMAIL);
         expect(s4SignUpStatusSpy).toHaveBeenCalledWith(TEST_EMAIL);
+        expect(mockReq.session.save).toHaveBeenCalled();
         expect(console.info).toHaveBeenCalledWith("Processing No HasTextCode");
         expect(mockRes.redirect).toHaveBeenCalledWith("resume-after-password");
     });
@@ -207,6 +212,7 @@ describe("processGetEmailForm controller tests", () => {
 
         await expect(processGetEmailForm(mockReq, mockRes, mockNext)).rejects.toThrow();
         expect(s4CreateUserSpy).toHaveBeenCalledWith(TEST_EMAIL);
+        expect(mockReq.session.save).toHaveBeenCalled();
         expect(s4SignUpStatusSpy).not.toHaveBeenCalled();
     });
 });

diff --git a/express/tests/mocks.ts b/express/tests/mocks.ts
@@ -44,10 +44,13 @@ export const mockCognitoInterface = {
     globalSignOut: jest.fn()
 };
 
-export const request = (properties?: Partial<Request> | object) =>
+export const request = (properties?: Partial<Request> | Record<string, unknown>) =>
     ({
         body: {},
-        session: {},
+        session: {
+            save: jest.fn(),
+            ...(properties?.session as Partial<Request["session"]>)
+        },
         app: {
             get: (keyName: string) => {
                 if (keyName === "backing-service") return new SelfServiceServicesService(mockCognitoInterface, mockLambdaFacade);