From f239b7111472aca07886fb255ac223c7b25aa592 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 28 Sep 2018 13:20:57 -0500 Subject: [PATCH] [SHIBUI-808] updated configuration --- .../tier/shibboleth/admin/ui/ShibbolethUiApplication.java | 3 +-- .../admin/ui/configuration/auto/WebSecurityConfig.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java index b5c69ef0d..a1ccd6c25 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java @@ -19,8 +19,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.stereotype.Component; -@Configuration -@EnableAutoConfiguration +@SpringBootApplication @ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = "edu.internet2.tier.shibboleth.admin.ui.configuration.auto.*")) @EntityScan(basePackages = "edu.internet2.tier.shibboleth.admin.ui.domain") @EnableJpaAuditing 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 a466e9706..4fdaf6707 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 @@ -39,6 +39,7 @@ public HttpFirewall allowUrlEncodedSlashHttpFirewall() { @Bean @ConditionalOnMissingBean(name = "webSecurityConfig") + @Profile("!no-auth") public WebSecurityConfigurerAdapter defaultAuth() { return new WebSecurityConfigurerAdapter() {