Bugfix and new minor release

OpenConext · Nov 26, 2024 · dabe8c1 · dabe8c1
1 parent c803372
commit dabe8c1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/account-gui/pom.xml b/account-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.6</version>
+        <version>7.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>account-gui</artifactId>

diff --git a/myconext-gui/pom.xml b/myconext-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.6</version>
+        <version>7.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>myconext-gui</artifactId>

diff --git a/myconext-server/pom.xml b/myconext-server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.6</version>
+        <version>7.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>myconext-server</artifactId>

diff --git a/myconext-server/src/main/java/myconext/api/UserController.java b/myconext-server/src/main/java/myconext/api/UserController.java
@@ -730,6 +730,10 @@ private ResponseEntity<UserResponse> returnUserResponse(User user) {
     private ResponseEntity<UserResponse> userResponseRememberMe(User user) {
         List<SamlAuthenticationRequest> samlAuthenticationRequests = authenticationRequestRepository.findByUserIdAndRememberMe(user.getId(), true);
         Optional<Registration> optionalRegistration = registrationRepository.findRegistrationByUserId(user.getId());
+        //Run-time migrate inconsistent state for none of the (external)linkedAccounts being the preferred one - idempotent
+        if (user.reconcileLinkedAccounts()) {
+            userRepository.save(user);
+        }
         UserResponse userResponse = new UserResponse(user, user.convertEduIdPerServiceProvider(this.servicesConfiguration), optionalRegistration, !samlAuthenticationRequests.isEmpty(), manage, issuers);
         return ResponseEntity.ok(userResponse);
     }

diff --git a/myconext-server/src/main/java/myconext/model/User.java b/myconext-server/src/main/java/myconext/model/User.java
@@ -369,9 +369,7 @@ public boolean reconcileLinkedAccounts() {
         if (!preferredInstitution) {
             Optional<ProvisionedLinkedAccount> first = provisionedLinkedAccounts.stream()
                     .max(Comparator.comparing(ProvisionedLinkedAccount::getCreatedAt));
-            first.ifPresent(provisionedLinkedAccount -> {
-                provisionedLinkedAccount.setPreferred(true);
-            });
+            first.ifPresent(provisionedLinkedAccount -> provisionedLinkedAccount.setPreferred(true));
             return first.isPresent();
         }
         return false;

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>myconext</artifactId>
-    <version>7.3.6</version>
+    <version>7.3.7</version>
     <packaging>pom</packaging>
     <name>myconext</name>
     <description>My OpenConext</description>

diff --git a/public-gui/pom.xml b/public-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.6</version>
+        <version>7.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>public-gui</artifactId>

diff --git a/tiqr-mock/pom.xml b/tiqr-mock/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.6</version>
+        <version>7.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tiqr-mock</artifactId>