INCIDEN-922: Pass access token to delete entries methods [deploy]

We're now expecting an access token on the backend, so we need to start passing it through here not to break any existing functionality.
govuk-one-login · Sep 18, 2024 · ef5c25a · ef5c25a
1 parent ffb21b3
commit ef5c25a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git a/express/src/controllers/register.ts b/express/src/controllers/register.ts
@@ -344,7 +344,7 @@ export const processAddServiceForm: RequestHandler = async (req, res, next) => {
 
     let serviceId = "";
     let body;
-
+    const accessToken = nonNull(req.session.authenticationResult?.AccessToken);
     try {
         console.info("Generating Client to Service:" + service.serviceName);
         const generatedClient = await s4.generateClient(service, nonNull(req.session.authenticationResult));
@@ -353,7 +353,7 @@ export const processAddServiceForm: RequestHandler = async (req, res, next) => {
     } catch (error) {
         console.error("Unable to Register Client to Service - Service Items removed");
         console.error(error);
-        await s4.deleteServiceEntries(uuid);
+        await s4.deleteServiceEntries(uuid, accessToken);
         return res.render("there-is-a-problem.njk");
     }
 

diff --git a/express/src/services/lambda-facade/LambdaFacade.ts b/express/src/services/lambda-facade/LambdaFacade.ts
@@ -153,7 +153,7 @@ export default class LambdaFacade implements LambdaFacadeInterface {
         }
     }
 
-    async deleteClientEntries(userID: string, serviceID: string): Promise<void> {
+    async deleteClientEntries(userID: string, serviceID: string, accessToken: string): Promise<void> {
         console.log("In LambdaFacade-deleteClientEntries");
 
         const body = {
@@ -162,22 +162,22 @@ export default class LambdaFacade implements LambdaFacadeInterface {
         };
 
         try {
-            await this.post("/delete-dynamodb-client-entries/", JSON.stringify(body));
+            await this.post("/delete-dynamodb-client-entries/", JSON.stringify(body), accessToken);
         } catch (error) {
             console.error(error as Error);
             throw error;
         }
     }
 
-    async deleteServiceEntries(serviceID: string): Promise<void> {
+    async deleteServiceEntries(serviceID: string, accessToken: string): Promise<void> {
         console.log("In LambdaFacade-deleteServiceEntries");
 
         const body = {
             serviceId: serviceID
         };
 
         try {
-            await this.post("/delete-dynamodb-service-entries/", JSON.stringify(body));
+            await this.post("/delete-dynamodb-service-entries/", JSON.stringify(body), accessToken);
         } catch (error) {
             console.error(error as Error);
             throw error;

diff --git a/express/src/services/lambda-facade/LambdaFacadeInterface.ts b/express/src/services/lambda-facade/LambdaFacadeInterface.ts
@@ -49,6 +49,6 @@ export default interface LambdaFacadeInterface {
 
     getDynamoDBEntries(email: string): Promise<AxiosResponse>;
 
-    deleteClientEntries(oldUserID: string, serviceID: string): Promise<void>;
-    deleteServiceEntries(serviceID: string): Promise<void>;
+    deleteClientEntries(oldUserID: string, serviceID: string, accessToken: string): Promise<void>;
+    deleteServiceEntries(serviceID: string, accessToken: string): Promise<void>;
 }
diff --git a/express/src/services/self-service-services-service.ts b/express/src/services/self-service-services-service.ts
@@ -362,16 +362,15 @@ export default class SelfServiceServicesService {
 
     async recreateDynamoDBAccountLinks(authenticationResult: AuthenticationResultType, oldUserID: string) {
         console.info("In self-service-services-service:createNewDynamoDBAccountLinks()");
+        const accessToken = nonNull(authenticationResult.AccessToken);
+        await this.validateToken(accessToken, "recreateDynamoDBAccountLinks");
 
-        const serviceListToReplicate = dynamoServicesToDomainServices(
-            (await this.lambda.listServices(oldUserID, nonNull(authenticationResult.AccessToken))).data.Items
-        );
+        const serviceListToReplicate = dynamoServicesToDomainServices((await this.lambda.listServices(oldUserID, accessToken)).data.Items);
 
         for (const serviceItem of serviceListToReplicate) {
             const serviceID: string = serviceItem.id;
             const serviceName: string = serviceItem.serviceName;
             const currentUserID = AuthenticationResultParser.getCognitoId(authenticationResult);
-            const accessToken: string = authenticationResult.AccessToken as string;
             const emailAddress = AuthenticationResultParser.getEmail(authenticationResult);
             const mobileNumber = AuthenticationResultParser.getPhoneNumber(authenticationResult);
 
@@ -392,13 +391,14 @@ export default class SelfServiceServicesService {
 
             await this.putUser(dynamoUser, accessToken);
             await this.newService(service, currentUserID, authenticationResult);
-            await this.lambda.deleteClientEntries(oldUserID, serviceID);
+            await this.lambda.deleteClientEntries(oldUserID, serviceID, accessToken);
         }
     }
 
-    async deleteServiceEntries(serviceID: string) {
+    async deleteServiceEntries(serviceID: string, accessToken: string) {
         console.info("In self-service-services-service:deleteServiceEntries()");
         console.log("Service ID => " + serviceID);
-        await this.lambda.deleteServiceEntries(serviceID);
+        await this.validateToken(accessToken, "deleteServiceEntries");
+        await this.lambda.deleteServiceEntries(serviceID, accessToken);
     }
 }
diff --git a/express/tests/controllers/register.test.ts b/express/tests/controllers/register.test.ts
@@ -18,6 +18,7 @@ import {
 } from "../../src/controllers/register";
 import {request, response} from "../mocks";
 import {
+    TEST_ACCESS_TOKEN,
     TEST_AUTHENTICATION_RESULT,
     TEST_COGNITO_ID,
     TEST_COGNITO_SESSION_STRING,
@@ -792,7 +793,7 @@ describe("processAddServiceForm controller tests", () => {
             {id: `service#${TEST_UUID}`, serviceName: TEST_SERVICE_NAME},
             TEST_AUTHENTICATION_RESULT
         );
-        expect(s4DeleteServiceEntriesSpy).toHaveBeenCalledWith(TEST_UUID);
+        expect(s4DeleteServiceEntriesSpy).toHaveBeenCalledWith(TEST_UUID, TEST_ACCESS_TOKEN);
         expect(mockRes.render).toHaveBeenCalledWith("there-is-a-problem.njk");
     });
 

diff --git a/express/tests/services/lambda-facade/LambdaFacade.test.ts b/express/tests/services/lambda-facade/LambdaFacade.test.ts
@@ -152,26 +152,36 @@ describe("Lambda Facade class tests", () => {
 
     it("POSTs the /delete-dynamodb-client-entries when the deleteClientEntries method is called", async () => {
         const mockLambdaFacade = new LambdaFacade();
-        await mockLambdaFacade.deleteClientEntries(TEST_COGNITO_ID, TEST_SERVICE_ID);
+        await mockLambdaFacade.deleteClientEntries(TEST_COGNITO_ID, TEST_SERVICE_ID, TEST_ACCESS_TOKEN);
 
         expect(mockPost).toHaveBeenCalledWith(
             "/delete-dynamodb-client-entries/",
             JSON.stringify({
                 userId: TEST_COGNITO_ID,
                 serviceId: TEST_SERVICE_ID
-            })
+            }),
+            {
+                headers: {
+                    Authorization: `Bearer ${TEST_ACCESS_TOKEN}`
+                }
+            }
         );
     });
 
     it("POSTs the /delete-dynamodb-service-entries when the deleteServiceEntries method is called", async () => {
         const mockLambdaFacade = new LambdaFacade();
-        await mockLambdaFacade.deleteServiceEntries(TEST_SERVICE_ID);
+        await mockLambdaFacade.deleteServiceEntries(TEST_SERVICE_ID, TEST_ACCESS_TOKEN);
 
         expect(mockPost).toHaveBeenCalledWith(
             "/delete-dynamodb-service-entries/",
             JSON.stringify({
                 serviceId: TEST_SERVICE_ID
-            })
+            }),
+            {
+                headers: {
+                    Authorization: `Bearer ${TEST_ACCESS_TOKEN}`
+                }
+            }
         );
     });