From 5a8634e3593e1e8b41d7e9e2c6620894d37de500 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Fri, 28 Apr 2017 09:48:42 +0200 Subject: [PATCH] KEYCLOAK-4814 disable keycloak spring boot by configuration --- .../springboot/KeycloakAutoConfiguration.java | 2 ++ .../springboot/KeycloakSpringBootProperties.java | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakAutoConfiguration.java b/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakAutoConfiguration.java index 986cf9a1bc..679691aef6 100755 --- a/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakAutoConfiguration.java +++ b/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakAutoConfiguration.java @@ -33,6 +33,7 @@ import org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve; import org.keycloak.adapters.undertow.KeycloakServletExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; @@ -60,6 +61,7 @@ import java.util.Set; @Configuration @ConditionalOnWebApplication @EnableConfigurationProperties(KeycloakSpringBootProperties.class) +@ConditionalOnProperty(value = "keycloak.enabled", matchIfMissing = true) public class KeycloakAutoConfiguration { private KeycloakSpringBootProperties keycloakProperties; diff --git a/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java b/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java index 788412fdb5..9c28a9a731 100644 --- a/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java +++ b/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java @@ -34,6 +34,11 @@ public class KeycloakSpringBootProperties extends AdapterConfig { @JsonIgnore private Map config = new HashMap(); + /** + * Allow enabling of Keycloak Spring Boot adapter by configuration. + */ + private boolean enabled = true; + public Map getConfig() { return config; } @@ -43,6 +48,14 @@ public class KeycloakSpringBootProperties extends AdapterConfig { */ private List securityConstraints = new ArrayList(); + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + /** * This matches security-constraint of the servlet spec */