Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/7 2 9 #204

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Release/7 2 9 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36fdec4
Chosenname is optional
oharsta Apr 5, 2024
5a1e1c0
Release 7.2.9
oharsta Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion account-gui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openconext</groupId>
<artifactId>myconext</artifactId>
<version>7.2.8</version>
<version>7.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>account-gui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion myconext-gui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openconext</groupId>
<artifactId>myconext</artifactId>
<version>7.2.8</version>
<version>7.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>myconext-gui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion myconext-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openconext</groupId>
<artifactId>myconext</artifactId>
<version>7.2.8</version>
<version>7.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>myconext-server</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions myconext-server/src/main/java/myconext/api/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion myconext-server/src/main/java/myconext/model/UpdateUserNameRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
@Getter
public class UpdateUserNameRequest implements Serializable {

@NotBlank
private String chosenName;

@NotBlank
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openconext</groupId>
<artifactId>myconext</artifactId>
<version>7.2.8</version>
<version>7.2.9</version>
<packaging>pom</packaging>
<name>myconext</name>
<description>My OpenConext</description>
Expand Down
2 changes: 1 addition & 1 deletion tiqr-mock/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openconext</groupId>
<artifactId>myconext</artifactId>
<version>7.2.8</version>
<version>7.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tiqr-mock</artifactId>
Expand Down
Loading