diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java index 4fdaf6707..0a0c9b9f5 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java @@ -1,7 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration.auto; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -9,7 +9,6 @@ import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.csrf.CookieCsrfTokenRepository; import org.springframework.security.web.firewall.HttpFirewall; @@ -22,6 +21,8 @@ * Workaround for slashes in URL from [https://stackoverflow.com/questions/48453980/spring-5-0-3-requestrejectedexception-the-request-was-rejected-because-the-url] */ @Configuration +@AutoConfigureOrder(Integer.MAX_VALUE - 100) +@ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) public class WebSecurityConfig { @Value("${shibui.logout-url:/dashboard}") @@ -38,7 +39,6 @@ public HttpFirewall allowUrlEncodedSlashHttpFirewall() { } @Bean - @ConditionalOnMissingBean(name = "webSecurityConfig") @Profile("!no-auth") public WebSecurityConfigurerAdapter defaultAuth() { return new WebSecurityConfigurerAdapter() {