You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/07 11:48:30 UTC

[isis] 02/06: ISIS-2218: also declares AuthenticatorBypass using @Service rather than @Bean

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

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 8f213a70e54cdb3a9d67dd60a73b10f4c9667754
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 10:21:05 2019 +0000

    ISIS-2218: also declares AuthenticatorBypass using @Service rather than @Bean
---
 .../isis/security/bypass/IsisModuleSecurityBypass.java   | 10 ++++------
 .../bypass/authentication/AuthenticatorBypass.java       | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
index 9b00d58..dc02344 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
@@ -39,17 +39,15 @@ import org.apache.isis.security.api.authorization.standard.Authorizor;
 @Configuration
 @Import({
         // modules
-        IsisModuleRuntimeServices.class
+        IsisModuleRuntimeServices.class,
+
+        // @Service's
+        AuthenticatorBypass.class,
 
 })
 public class IsisModuleSecurityBypass {
 
     @Bean @Singleton
-    public Authenticator authenticator() {
-        return new AuthenticatorBypass();
-    }
-
-    @Bean @Singleton
     public Authorizor authorizor() {
         return new AuthorizorBypass();
     }
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 5842cc5..ba40bf1 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -19,15 +19,25 @@
 
 package org.apache.isis.security.bypass.authentication;
 
+import lombok.extern.log4j.Log4j2;
+
+import javax.inject.Named;
+
+import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.security.api.authentication.AuthenticationRequest;
 import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
 
 /**
  * Implementation that bypasses authentication.
- *
- * <p>
- * Intended for testing use only.
  */
+@Service
+@Named("isisSecurityBypass.AuthenticatorBypass")
+@Order(OrderPrecedence.LOW)
+@Qualifier("Bypass")
+@Log4j2
 public class AuthenticatorBypass extends AuthenticatorAbstract {
 
     @Override