CCM-11889: update tests

Author: mark-r-bjss

infrastructure/terraform/components/sandbox/aws_cognito_user_pool_sandbox.tf

@@ -25,4 +25,12 @@ resource "aws_cognito_user_pool" "sandbox" {
     required            = false
     string_attribute_constraints {}
   }
+
+  schema {
+    name                = "nhs_notify_user_id"
+    attribute_data_type = "String"
+    mutable             = true
+    required            = false
+    string_attribute_constraints {}
+  }
 }

lambdas/cognito-triggers/src/pre-token-generation.ts

@@ -25,6 +25,7 @@ export class PreTokenGenerationLambda {
 
     const clientId = userAttributes['custom:sbx_client_id'];
     const clientName = userAttributes['custom:sbx_client_name'];
+    const internalUserId = userAttributes['custom:nhs_notify_user_id'];
 
     if (clientId) {
       response = PreTokenGenerationLambda.setTokenClaims(
@@ -73,6 +74,19 @@ export class PreTokenGenerationLambda {
       );
     }
 
+    if (internalUserId) {
+      response = PreTokenGenerationLambda.setTokenClaims(
+        response,
+        'idTokenGeneration',
+        { 'nhs-notify:internal-user-id': internalUserId }
+      );
+      response = PreTokenGenerationLambda.setTokenClaims(
+        response,
+        'accessTokenGeneration',
+        { 'nhs-notify:internal-user-id': internalUserId }
+      );
+    }
+
     return response;
   };
 

tests/accessibility/pa11y-setup.ts

@@ -93,7 +93,7 @@ const setup = async () => {
   const familyName = 'Bergstrom';
   const userName = ['Dr', givenName, familyName];
 
-  const { userId } = await testUserClient.createTestUser(
+  const { internalUserId } = await testUserClient.createTestUser(
     testEmail,
     testPassword,
     clientId,
@@ -168,7 +168,7 @@ const setup = async () => {
     email: testEmail,
     password: testPassword,
     templateIds,
-    userId,
+    internalUserId,
     clientId,
     clientName,
     userName,

tests/accessibility/test-user-client.ts

@@ -46,6 +46,8 @@ export class TestUserClient {
       })
     );
 
+    const internalUserId = crypto.randomUUID();
+
     const res = await this.cognitoClient.send(
       new AdminCreateUserCommand({
         UserPoolId: this.userPoolId,
@@ -55,6 +57,7 @@ export class TestUserClient {
           { Name: 'email_verified', Value: 'true' },
           { Name: 'custom:sbx_client_id', Value: clientId },
           { Name: 'custom:sbx_client_name', Value: clientName },
+          { Name: 'custom:nhs_notify_user_id', Value: internalUserId },
           { Name: 'given_name', Value: displayUsernameParts.at(-2) },
           { Name: 'family_name', Value: displayUsernameParts.at(-1) },
           { Name: 'preferred_username', Value: displayUsernameParts.join(' ') },
@@ -73,16 +76,11 @@ export class TestUserClient {
     );
 
     const username = res.User?.Username;
-
-    const userId = res.User?.Attributes?.find(
-      (attr) => attr.Name === 'sub'
-    )?.Value;
-
-    if (!username || !userId) {
+    if (!username) {
       throw new Error('Error during user creation');
     }
 
-    return { username, userId };
+    return { username, internalUserId };
   }
 
   async deleteTestUser(email: string, clientId: string) {