1204 - We should not react to security.basic.enabled

Author: Mario

extensions/spring/boot/stormpath-spring-security-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathSpringSecurityAutoConfiguration.java

@@ -39,7 +39,7 @@
  */
 @SuppressWarnings("SpringFacetCodeInspection")
 @Configuration
-@ConditionalOnProperty(name = { "stormpath.enabled", "stormpath.spring.security.enabled",  "security.basic.enabled"}, matchIfMissing = true)
+@ConditionalOnProperty(name = { "stormpath.enabled", "stormpath.spring.security.enabled"}, matchIfMissing = true)
 @AutoConfigureAfter({ StormpathAutoConfiguration.class, SecurityAutoConfiguration.class })
 public class StormpathSpringSecurityAutoConfiguration extends AbstractStormpathSpringSecurityConfiguration {
 

extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityAutoConfiguration.java

@@ -50,7 +50,7 @@
  */
 @SuppressWarnings("SpringFacetCodeInspection")
 @Configuration
-@ConditionalOnProperty(name = {"stormpath.enabled", "stormpath.web.enabled", "stormpath.spring.security.enabled", "security.basic.enabled"}, matchIfMissing = true)
+@ConditionalOnProperty(name = {"stormpath.enabled", "stormpath.web.enabled", "stormpath.spring.security.enabled"}, matchIfMissing = true)
 @ConditionalOnClass({Servlet.class, Filter.class, DispatcherServlet.class})
 @ConditionalOnWebApplication
 @AutoConfigureBefore(StormpathWebMvcAutoConfiguration.class)

extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityDisabledAutoConfiguration.java

@@ -40,22 +40,20 @@
 @ConditionalOnClass({Servlet.class, Filter.class, DispatcherServlet.class})
 @ConditionalOnWebApplication
 @AutoConfigureAfter(StormpathWebSecurityAutoConfiguration.class)
-@ConditionalOnExpression("'${stormpath.spring.security.enabled}'=='false' || '${security.basic.enabled}'=='false'")
+@ConditionalOnExpression("'${stormpath.spring.security.enabled}'=='false'")
 public class StormpathWebSecurityDisabledAutoConfiguration extends AbstractStormpathWebSecurityDisabledConfiguration {
 
     @Bean
     @ConditionalOnMissingBean(name="stormpathSecurityConfigurerAdapter")
-    @ConditionalOnProperty(name = "security.basic.enabled", havingValue = "true") //we only need our Disabled Configurer Adapter if Spring Security is enabled
     public SecurityConfigurerAdapter stormpathSecurityConfigurerAdapter() {
-        //This bean will only be created if our Spring Security integration is disabled but Spring Security is enabled
+        //This bean will only be created if our Spring Security integration is disabled
         return super.stormpathSecurityConfigurerAdapter();
     }
 
     @Bean
     @ConditionalOnMissingBean(name="stormpathLogoutHandler")
-    @ConditionalOnProperty(name = "security.basic.enabled", havingValue = "true") //we only need our logout handler if Spring Security is enabled
     public LogoutHandler stormpathLogoutHandler() {
-        //This bean will only be created if our Spring Security integration is disabled but Spring Security is enabled
+        //This bean will only be created if our Spring Security integration is disabled
         return super.stormpathLogoutHandler();
     }
 

extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/test/groovy/com/stormpath/spring/boot/autoconfigure/DisabledSpringSecurityDisablesStormpathSSAutoConfigurationIT.groovy

@@ -41,7 +41,7 @@
 @Configuration
 @EnableStormpathWebMvc
 @EnableStormpathSecurity
-@Conditional({StormpathSpringSecurityEnabled.class, StormpathWebEnabled.class, StormpathEnabled.class, SecurityBasicEnabled.class})
+@Conditional({StormpathSpringSecurityEnabled.class, StormpathWebEnabled.class, StormpathEnabled.class})
 public class StormpathWebSecurityConfiguration extends AbstractStormpathWebSecurityConfiguration {
 
     @Bean

extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/test/resources/disabledspringsecuritydisablesstormpathss.application.properties

@@ -42,9 +42,6 @@ public class StormpathWebSecurityConfigurer extends AbstractHttpConfigurer<Storm
     @Value("#{ @environment['stormpath.enabled'] ?: true }")
     protected boolean stormpathEnabled;
 
-    @Value("#{ @environment['security.basic.enabled'] ?: true }")
-    protected boolean securityBasicEnabled;
-
     /**
      * Extend WebSecurityConfigurerAdapter and configure the {@code HttpSecurity} object using
      * the {@link com.stormpath.spring.config.StormpathWebSecurityConfigurer#stormpath stormpath()} utility method.
@@ -85,7 +82,7 @@ public void init(HttpSecurity http) throws Exception {
         ApplicationContext context = http.getSharedObject(ApplicationContext.class);
         context.getAutowireCapableBeanFactory().autowireBean(this);
 
-        if (stormpathEnabled && securityBasicEnabled) { /// we only need the configurer if both Stormpath and Basic Configuration is enabled
+        if (stormpathEnabled) { /// we only need the configurer Stormpath is enabled
             stormpathSecurityConfigurerAdapter.init(http);
         }
     }

extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebSecurityConfiguration.java

@@ -26,20 +26,18 @@
  */
 @SuppressWarnings("SpringFacetCodeInspection")
 @Configuration
-@Conditional(StormpathSpringSecurityOrSecurityBasicDisabled.class)
+@Conditional(StormpathSpringSecurityDisabled.class)
 public class StormpathWebSecurityDisabledConfiguration extends AbstractStormpathWebSecurityDisabledConfiguration {
 
     @Bean
-    @Conditional(SecurityBasicEnabled.class) //we only need our Disabled Configurer Adapter if Spring Security is enabled
     public SecurityConfigurerAdapter stormpathSecurityConfigurerAdapter() {
-        //This bean will only be created if Spring Security integration is disabled but Spring Security is enabled
+        //This bean will only be created if our Spring Security integration is disabled
         return super.stormpathSecurityConfigurerAdapter();
     }
 
     @Bean
-    @Conditional(SecurityBasicEnabled.class) //we only need our Disabled Configurer Adapter if Spring Security is enabled
     public LogoutHandler stormpathLogoutHandler() {
-        //This bean will only be created if Spring Security integration is disabled but Spring Security is enabled
+        //This bean will only be created if our Spring Security integration
         return super.stormpathLogoutHandler();
     }
 }