10007: more sub vs custom:userId refactoring

ustaxcourt · Jan 23, 2024 · b65c182 · b65c182
1 parent b4d38a3
commit b65c182
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/shared/src/business/useCaseHelper/caseAssociation/addExistingUserToCase.ts b/shared/src/business/useCaseHelper/caseAssociation/addExistingUserToCase.ts
@@ -30,6 +30,7 @@ export const addExistingUserToCase = async ({
     throw new UnauthorizedError('Unauthorized');
   }
 
+  //TODO 10007: make sure this flow is also tested
   const userIdFromCognito = await applicationContext
     .getPersistenceGateway()
     .getCognitoUserIdByEmail({

diff --git a/web-api/src/persistence/cognito/getCognitoUserIdByEmail.ts b/web-api/src/persistence/cognito/getCognitoUserIdByEmail.ts
@@ -11,13 +11,14 @@ export const getCognitoUserIdByEmail = async ({
       Username: email,
     });
 
-    const customUserId = (
-      userFromCognito.UserAttributes?.find(
-        attribute => attribute.Name === 'custom:userId',
-      ) || {}
-    ).Value;
-    // replace with sub here
-    return customUserId || userFromCognito.Username;
+    const customUserId =
+      userFromCognito?.UserAttributes?.find(
+        element => element.Name === 'custom:userId',
+      )?.Value ||
+      userFromCognito?.UserAttributes?.find(element => element.Name === 'sub')
+        ?.Value;
+
+    return customUserId;
   } catch (e) {
     return null;
   }