[cas-2393] Use sso email id to validate the user

Crown-Commercial-Service · May 23, 2024 · 4c1de29 · SamThomasJ · May 23, 2024 · SamThomasJ
1 parent aaede83
commit 4c1de29
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/uk/gov/crowncommercial/dts/scale/cat/service/MessageService.java b/src/main/java/uk/gov/crowncommercial/dts/scale/cat/service/MessageService.java
@@ -329,8 +329,11 @@ private CaTMessageOCDSAllOfAuthor getAuthorDetails(
           .resolveBuyerUserByUserId(String.valueOf(message.getSenderUser().getId()))
           .orElseThrow(() -> new ResourceNotFoundException(
               String.format("Jaggaer user not found for %s", message.getSenderUser().getId())));
-      var conclaveUser = conclaveService.getUserProfile(jaggaerUser.getEmail())
-          .orElseThrow(() -> new ResourceNotFoundException("Conclave"));
+      Optional<SSOCodeData.SSOCode> ssoCode = jaggaerUser.getSsoCodeData().getSsoCode().stream().findFirst();
+      var conclaveUser = conclaveService.getUserProfile(ssoCode.isPresent()
+                      && Objects.nonNull(ssoCode.get().getSsoUserLogin())
+                      ? ssoCode.get().getSsoUserLogin() : jaggaerUser.getEmail())
+              .orElseThrow(() -> new ResourceNotFoundException("Conclave"));
       var conclaveOrg = conclaveService.getOrganisationIdentity(conclaveUser.getOrganisationId())
           .orElseThrow(() -> new ResourceNotFoundException(
               format(ERR_MSG_FMT_CONCLAVE_USER_ORG_MISSING, conclaveUser.getOrganisationId())));