Ignore remote exceptions during login

OpenConext · Apr 16, 2024 · 01b497c · 01b497c
1 parent bea24bc
commit 01b497c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.12-SNAPSHOT</version>
+        <version>0.0.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-client</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>access</artifactId>
-    <version>0.0.12-SNAPSHOT</version>
+    <version>0.0.12</version>
     <packaging>pom</packaging>
     <name>access</name>
     <description>SURFconext Invite</description>

diff --git a/provisioning-mock/pom.xml b/provisioning-mock/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.12-SNAPSHOT</version>
+        <version>0.0.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>provisioning-mock</artifactId>

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

diff --git a/server/src/main/java/access/security/CustomOidcUserService.java b/server/src/main/java/access/security/CustomOidcUserService.java
@@ -5,6 +5,8 @@
 import access.provision.ProvisioningService;
 import access.repository.UserRepository;
 import lombok.Getter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
@@ -22,6 +24,8 @@
 
 public class CustomOidcUserService implements OAuth2UserService<OidcUserRequest, OidcUser> {
 
+    private static final Log LOG = LogFactory.getLog(CustomOidcUserService.class);
+
     @Getter
     private final Manage manage;
     private final ProvisioningService provisioningService;
@@ -68,7 +72,13 @@ public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2Authenticatio
         optionalUser.ifPresent(user -> {
             boolean changed = user.updateAttributes(newClaims);
             if (changed) {
-                provisioningService.updateUserRequest(user);
+                try {
+                    provisioningService.updateUserRequest(user);
+                } catch (RuntimeException e) {
+                    //We choose to ignore these
+                    LOG.error("Error in updateUserRequest", e);
+                }
+
             }
             userRepository.save(user);
         });

diff --git a/welcome/pom.xml b/welcome/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.12-SNAPSHOT</version>
+        <version>0.0.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-welcome</artifactId>