1123 fixed ITs and added new ones

Author: Mario

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

@@ -16,8 +16,8 @@
 package com.stormpath.spring.config;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 
@@ -26,7 +26,7 @@
  */
 @SuppressWarnings("SpringFacetCodeInspection")
 @Configuration
-@Order(100) //Must come after StormpathWebSecurityConfiguration
+@Conditional(StormpathSpringSecurityDisabled.class)
 public class StormpathWebSecurityDisabledConfiguration extends AbstractStormpathWebSecurityDisabledConfiguration {
 
     @Bean

extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/DisabledStormpathSpringSecurityWebMvcConfigurationIT.groovy

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.spring.config
+
+import com.stormpath.sdk.api.ApiKey
+import com.stormpath.sdk.cache.CacheManager
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.security.config.annotation.SecurityConfigurerAdapter
+import org.springframework.security.web.FilterChainProxy
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.web.WebAppConfiguration
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+import org.springframework.web.context.WebApplicationContext
+import org.testng.annotations.BeforeClass
+import org.testng.annotations.Test
+
+import javax.servlet.Filter
+import static org.testng.Assert.*
+
+/**
+ * @since 1.3.0
+ */
+@ContextConfiguration(classes = [DisabledStormpathSpringSecurityWebMvcTestAppConfig.class, TwoAppTenantStormpathTestConfiguration.class])
+@WebAppConfiguration
+class DisabledStormpathSpringSecurityWebMvcConfigurationIT extends AbstractClientIT {
+
+    private static final Logger log = LoggerFactory.getLogger(DisabledStormpathSpringSecurityWebMvcConfigurationIT)
+
+    @Autowired
+    SecurityConfigurerAdapter stormpathSecurityConfigurerAdapter;
+
+    @Autowired
+    ApiKey apiKey;
+
+    @Autowired
+    CacheManager stormpathCacheManager;
+
+    @Autowired
+    Filter stormpathFilter
+
+    @Autowired
+    WebApplicationContext context;
+
+    @Autowired
+    protected FilterChainProxy springSecurityFilterChain;
+
+    @Autowired
+    protected Filter stormpathFilter;
+
+    private MockMvc mvc;
+
+    @BeforeClass
+    public void setUp() {
+
+        super.setUp()
+
+        mvc = MockMvcBuilders.webAppContextSetup(context)
+                .addFilter(springSecurityFilterChain, "/*") //Spring security in front of Stormpath
+                .addFilter(stormpathFilter, "/*")
+                .build();
+    }
+
+    @Test
+    void testRequiredBeans() {
+        assertTrue stormpathSecurityConfigurerAdapter instanceof DisabledStormpathSecurityConfigurerAdapter //let's assert Stormpath's Spring Security integration is disabled
+        assertNotNull apiKey
+        assertNotNull stormpathCacheManager
+        assertNotNull client
+        assertNotNull application
+        assertNotNull stormpathFilter
+    }
+
+}

extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/DisabledStormpathSpringSecurityWebMvcTestAppConfig.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.spring.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+import static com.stormpath.spring.config.StormpathWebSecurityConfigurer.stormpath;
+
+/**
+ * @since 1.0.RC5
+ */
+@Configuration
+@EnableStormpathWebSecurity
+@PropertySource({"classpath:com/stormpath/spring/config/disabledspringsecurity.application.properties"})
+public class DisabledStormpathSpringSecurityWebMvcTestAppConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.apply(stormpath());
+    }
+
+}

extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/MinimalStormpathSpringSecurityWebMvcConfigurationIT.groovy

@@ -43,6 +43,7 @@ import org.springframework.security.authentication.AuthenticationEventPublisher
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.authentication.ProviderManager
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
+import org.springframework.security.config.annotation.SecurityConfigurerAdapter
 import org.springframework.security.core.Authentication
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.context.SecurityContextHolder
@@ -76,7 +77,7 @@ class MinimalStormpathSpringSecurityWebMvcConfigurationIT extends AbstractClient
     private static final Logger log = LoggerFactory.getLogger(MinimalStormpathSpringSecurityWebMvcConfigurationIT)
 
     @Autowired
-    StormpathWebSecurityConfigurer c;
+    SecurityConfigurerAdapter stormpathSecurityConfigurerAdapter;
 
     @Autowired
     ApiKey apiKey;
@@ -141,6 +142,7 @@ class MinimalStormpathSpringSecurityWebMvcConfigurationIT extends AbstractClient
 
     @Test
     void testRequiredBeans() {
+        assertTrue stormpathSecurityConfigurerAdapter instanceof StormpathSecurityConfigurerAdapter //let's assert Stormpath's Spring Security integration is not disabled
         assertNotNull apiKey
         assertNotNull stormpathCacheManager
         assertNotNull client

extensions/spring/stormpath-spring-security-webmvc/src/test/java/com/stormpath/spring/config/MinimalStormpathSpringSecurityWebMvcTestAppConfig.java

@@ -31,7 +31,7 @@
  */
 @Configuration
 @EnableStormpathWebSecurity
-public class MinimalStormpathSpringSecurityWebMvcTestAppConfig  extends WebSecurityConfigurerAdapter {
+public class MinimalStormpathSpringSecurityWebMvcTestAppConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {

extensions/spring/stormpath-spring-security-webmvc/src/test/resources/com/stormpath/spring/config/disabledspringsecurity.application.properties

@@ -0,0 +1,16 @@
+#
+# Copyright 2017 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+stormpath.spring.security.enabled = false

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.spring.config;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @since 1.3.0
+ */
+public class StormpathSpringSecurityDisabled implements Condition {
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        return context.getEnvironment().getProperty("stormpath.spring.security.enabled", Boolean.class).equals(Boolean.FALSE);
+    }
+}