Chosenname is optional

OpenConext · Apr 5, 2024 · 36fdec4 · 36fdec4
1 parent d76dca4
commit 36fdec4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/myconext-server/src/main/java/myconext/api/UserController.java b/myconext-server/src/main/java/myconext/api/UserController.java
@@ -359,12 +359,13 @@ public ResponseEntity<StatusResponse> createEduIDAccount(@Valid @RequestBody Cre
         return ResponseEntity.status(HttpStatus.CREATED).body(new StatusResponse(HttpStatus.CREATED.value()));
     }
 
-    @Operation(summary = "Change names", description = "Update the givenName and / or familyName of the User")
+    @Operation(summary = "Change names", description = "Update the givenName, chosenName and / or the familyName of the User")
     @PutMapping("/sp/update")
     public ResponseEntity<UserResponse> updateUserProfile(Authentication authentication, @Valid @RequestBody UpdateUserNameRequest deltaUser) {
         User user = userFromAuthentication(authentication);
-
-        user.setChosenName(deltaUser.getChosenName());
+        if (StringUtils.hasText(deltaUser.getChosenName())) {
+            user.setChosenName(deltaUser.getChosenName());
+        }
         user.setGivenName(deltaUser.getGivenName());
         user.setFamilyName(deltaUser.getFamilyName());
         user.validate();

diff --git a/myconext-server/src/main/java/myconext/model/UpdateUserNameRequest.java b/myconext-server/src/main/java/myconext/model/UpdateUserNameRequest.java
@@ -12,7 +12,6 @@
 @Getter
 public class UpdateUserNameRequest implements Serializable {
 
-    @NotBlank
     private String chosenName;
 
     @NotBlank