feat(backend): Personalize private info message using UserInfo claims

Author: rhofkens

backend/src/main/java/ai/bluefields/oidcauthdemo/service/PrivateInfoService.java

@@ -53,17 +53,32 @@ public Mono<PrivateInfoResponse> getInfo(Authentication authentication) {
         .bodyToMono(Map.class) // Assuming response is a JSON object
         .map(
             userInfoMap -> {
-              // Extract email, handle potential null or incorrect type
+              // Extract claims, handle potential null or incorrect type
               Object emailObj = userInfoMap.get("email");
               String email = (emailObj instanceof String) ? (String) emailObj : "Email not found";
-              return new PrivateInfoResponse("Hello AUTH (from UserInfo)", email);
+
+              Object givenNameObj = userInfoMap.get("given_name");
+              String givenName = (givenNameObj instanceof String) ? (String) givenNameObj : "User";
+
+              Object familyNameObj = userInfoMap.get("family_name");
+              String familyName =
+                  (familyNameObj instanceof String)
+                      ? (String) familyNameObj
+                      : ""; // Default to empty if missing
+
+              // Construct message carefully to avoid double spaces if familyName is empty
+              String fullName = givenName + (familyName.isEmpty() ? "" : " " + familyName);
+              String message = String.format("Hello %s (from UserInfo)", fullName.trim());
+
+              return new PrivateInfoResponse(message, email);
             })
         .onErrorResume(
             error -> {
               // Log the error appropriately in a real application
               System.err.println("Error fetching UserInfo: " + error.getMessage());
               return Mono.just(
-                  new PrivateInfoResponse("Hello AUTH (UserInfo Error)", "Error fetching email"));
+                  new PrivateInfoResponse(
+                      "Hello User (UserInfo Error)", "Error fetching user details"));
             });
   }
 }

backend/src/test/java/ai/bluefields/oidcauthdemo/service/PrivateInfoServiceTest.java

@@ -66,11 +66,17 @@ void setUp() throws MalformedURLException {
   }
 
   @Test
-  void getInfo_shouldReturnResponseWithEmailFromUserInfo_whenSuccessful() {
+  void getInfo_shouldReturnPersonalizedResponse_whenUserInfoSuccessful() {
     // Arrange
     String testEmail = "userinfo@example.com";
+    String testGivenName = "John";
+    String testFamilyName = "Doe";
     String expectedUserInfoUrl = "http://mock-issuer.com/oidc/v1/userinfo";
-    Map<String, Object> userInfoResponseMap = Map.of("email", testEmail);
+    Map<String, Object> userInfoResponseMap =
+        Map.of(
+            "email", testEmail,
+            "given_name", testGivenName,
+            "family_name", testFamilyName);
 
     // Mock the final bodyToMono call for success
     when(responseSpec.bodyToMono(Map.class)).thenReturn(Mono.just(userInfoResponseMap));
@@ -83,7 +89,8 @@ void getInfo_shouldReturnResponseWithEmailFromUserInfo_whenSuccessful() {
         .assertNext(
             response -> {
               assertThat(response).isNotNull();
-              assertThat(response.message()).isEqualTo("Hello AUTH (from UserInfo)");
+              assertThat(response.message())
+                  .isEqualTo("Hello John Doe (from UserInfo)"); // Updated assertion
               assertThat(response.email()).isEqualTo(testEmail);
             })
         .verifyComplete();
@@ -113,8 +120,10 @@ void getInfo_shouldReturnErrorResponse_whenUserInfoCallFails() {
         .assertNext(
             response -> {
               assertThat(response).isNotNull();
-              assertThat(response.message()).isEqualTo("Hello AUTH (UserInfo Error)");
-              assertThat(response.email()).isEqualTo("Error fetching email");
+              assertThat(response.message())
+                  .isEqualTo("Hello User (UserInfo Error)"); // Updated assertion
+              assertThat(response.email())
+                  .isEqualTo("Error fetching user details"); // Updated assertion
             })
         .verifyComplete(); // onErrorResume handles the error, so the Mono completes
 
@@ -149,11 +158,11 @@ void getInfo_shouldReturnErrorMono_whenAuthenticationIsNotJwt() {
   }
 
   @Test
-  void getInfo_shouldReturnDefaultEmail_whenEmailMissingInUserInfo() {
+  void getInfo_shouldReturnDefaultValues_whenClaimsMissingInUserInfo() { // Renamed test
     // Arrange
-    Map<String, Object> userInfoResponseMap = Collections.emptyMap(); // No email claim
+    Map<String, Object> userInfoResponseMap = Collections.emptyMap(); // No email or name claims
 
-    // Mock the final bodyToMono call for success with missing email
+    // Mock the final bodyToMono call for success with missing claims
     when(responseSpec.bodyToMono(Map.class)).thenReturn(Mono.just(userInfoResponseMap));
 
     // Act
@@ -164,8 +173,9 @@ void getInfo_shouldReturnDefaultEmail_whenEmailMissingInUserInfo() {
         .assertNext(
             response -> {
               assertThat(response).isNotNull();
-              assertThat(response.message()).isEqualTo("Hello AUTH (from UserInfo)");
-              assertThat(response.email()).isEqualTo("Email not found"); // Default value
+              assertThat(response.message())
+                  .isEqualTo("Hello User (from UserInfo)"); // Updated assertion for default message
+              assertThat(response.email()).isEqualTo("Email not found"); // Default email value
             })
         .verifyComplete();
   }