chore: try to fix unstable spring dependency wiring problem (dhis2#6058)

* Add ifTest check in OIDC condition (config enabler) this was starting the DefaultDhisConfigurationProvider in the integrations tests Signed-off-by: Morten Svanaes <[email protected]>
0xafrogeek · Sep 2, 2020 · e1c0824 · e1c0824
1 parent 6012e61
commit e1c0824
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../security/oidc/OidcDisabledCondition.java → ...s/security/oidc/OidcEnabledCondition.java b/.../security/oidc/OidcDisabledCondition.java → ...s/security/oidc/OidcEnabledCondition.java
@@ -36,11 +36,15 @@
 /**
  * @author Morten Svanæs <[email protected]>
  */
-public class OidcDisabledCondition extends PropertiesAwareConfigurationCondition
+public class OidcEnabledCondition extends PropertiesAwareConfigurationCondition
 {
     @Override
     public boolean matches( ConditionContext context, AnnotatedTypeMetadata metadata )
     {
+        if ( isTestRun( context ) )
+        {
+            return false;
+        }
         String isEnabled = getConfiguration().getProperty( ConfigurationKey.OIDC_OAUTH2_LOGIN_ENABLED );
         return isEnabled.equalsIgnoreCase( "on" );
     }

diff --git a/...b-api/src/main/java/org/hisp/dhis/webapi/security/config/DhisWebApiWebSecurityConfig.java b/...b-api/src/main/java/org/hisp/dhis/webapi/security/config/DhisWebApiWebSecurityConfig.java
@@ -31,7 +31,7 @@
 import org.hisp.dhis.security.oauth2.DefaultClientDetailsService;
 import org.hisp.dhis.security.oidc.DhisClientRegistrationRepository;
 import org.hisp.dhis.security.oidc.DhisOAuth2AuthorizationRequestResolver;
-import org.hisp.dhis.security.oidc.OidcDisabledCondition;
+import org.hisp.dhis.security.oidc.OidcEnabledCondition;
 import org.hisp.dhis.webapi.filter.CorsFilter;
 import org.hisp.dhis.webapi.filter.CustomAuthenticationFilter;
 import org.hisp.dhis.webapi.oprovider.DhisOauthAuthenticationProvider;
@@ -187,7 +187,7 @@ public void configure( final AuthorizationServerEndpointsConfigurer endpoints )
      */
     @Configuration
     @Order( 1010 )
-    @Conditional( value = OidcDisabledCondition.class )
+    @Conditional( value = OidcEnabledCondition.class )
     public class OidcSecurityConfig extends WebSecurityConfigurerAdapter
     {
         @Autowired