You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/06/14 15:50:55 UTC

(causeway) 03/03: CAUSEWAY-3778: now honours autoCreatePolicy

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch CAUSEWAY-3778
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit b58dab7bfc84e28bb2098b6b5f47c20a3e6de229
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 14 16:50:47 2024 +0100

    CAUSEWAY-3778: now honours autoCreatePolicy
    
    along with new option, DO_NOT_AUTO_CREATE
---
 .../core/config/CausewayConfiguration.java         |  1 +
 .../dom/ApplicationUserAutoCreationService.java    | 32 +++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index c498d13902..4857a2d72c 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -4352,6 +4352,7 @@ public class CausewayConfiguration {
                 public enum AutoCreatePolicy {
                     AUTO_CREATE_AS_LOCKED,
                     AUTO_CREATE_AS_UNLOCKED,
+                    DO_NOT_AUTO_CREATE,
                 }
 
                 /**
diff --git a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
index c1a182f131..9d505983dc 100644
--- a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
+++ b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
@@ -22,19 +22,16 @@ package org.apache.causeway.extensions.secman.delegated.springoauth2.dom;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
 import org.springframework.lang.Nullable;
 import org.springframework.security.authentication.event.InteractiveAuthenticationSuccessEvent;
-import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +48,15 @@ import org.apache.causeway.extensions.secman.applib.user.dom.mixins.ApplicationU
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
+/**
+ * This service automatically creates an {@link ApplicationUser} if an end-user successfully logged in via Oauth.
+ *
+ * <p>
+ *     The initial set of rules are as per {@link CausewayConfiguration.Extensions.Secman.DelegatedUsers.AutoCreatePolicy}
+ * </p>
+ *
+ * @since 2.0 {@index}
+ */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 @Priority(PriorityPrecedence.MIDPOINT)
@@ -76,14 +82,26 @@ public class ApplicationUserAutoCreationService {
         val username = oidcUser.getPreferredUsername();
         val email = oidcUser.getEmail();
 
+        val secmanConfig = causewayConfiguration.getExtensions().getSecman().getDelegatedUsers();
+        switch (secmanConfig.getAutoCreatePolicy()) {
+            case DO_NOT_AUTO_CREATE:
+                break;
+            case AUTO_CREATE_AS_LOCKED:
+                create(username, email, secmanConfig.getInitialRoleNames(), ApplicationUserStatus.LOCKED);
+                break;
+            case AUTO_CREATE_AS_UNLOCKED:
+                create(username, email, secmanConfig.getInitialRoleNames(), ApplicationUserStatus.UNLOCKED);
+                break;
+        }
+    }
+
+    private void create(String username, String email, List<String> initialRoleNames, ApplicationUserStatus userStatus) {
         interactionService.runAnonymous(() -> {
-            Optional<ApplicationUser> userIfAny = applicationUserRepository.findByUsername(username);
+            val userIfAny = applicationUserRepository.findByUsername(username);
             if (userIfAny.isEmpty()) {
-                val status = ApplicationUserStatus.UNLOCKED;  // locking not supported for spring delegated accounts
-                val applicationUser = applicationUserRepository.newDelegateUser(username, status);
+                val applicationUser = applicationUserRepository.newDelegateUser(username, userStatus);
                 factoryService.mixin(ApplicationUser_updateEmailAddress.class, applicationUser).act(email);
 
-                val initialRoleNames = causewayConfiguration.getExtensions().getSecman().getDelegatedUsers().getInitialRoleNames();
                 if (notEmpty(initialRoleNames)) {
                     for (String initialRoleName : initialRoleNames) {
                         addRoleIfExists(applicationUser, initialRoleName);