diff --git a/spring-security-modules/spring-security-saml/pom.xml b/spring-security-modules/spring-security-saml/pom.xml
index 624f314865..36e5f46bc2 100644
--- a/spring-security-modules/spring-security-saml/pom.xml
+++ b/spring-security-modules/spring-security-saml/pom.xml
@@ -23,14 +23,14 @@
-
+
org.springframework.boot
spring-boot-starter-web
org.springframework.boot
spring-boot-starter-security
-
+
org.springframework.boot
spring-boot-starter-thymeleaf
@@ -40,7 +40,7 @@
spring-security-saml2-core
${saml2-core.spring.version}
-
+
spring-security-saml
diff --git a/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/SamlSecurityConfig.java b/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/SamlSecurityConfig.java
index 11bb6debf0..378db478cf 100644
--- a/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/SamlSecurityConfig.java
+++ b/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/SamlSecurityConfig.java
@@ -129,12 +129,6 @@ public class SamlSecurityConfig {
samlEntryPoint.setDefaultProfileOptions(defaultWebSSOProfileOptions());
return samlEntryPoint;
}
-
- @Bean
- public SAMLDiscovery samlIDPDiscovery() {
- SAMLDiscovery idpDiscovery = new SAMLDiscovery();
- return idpDiscovery;
- }
@Bean
public ExtendedMetadata extendedMetadata() {
diff --git a/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/WebSecurityConfig.java b/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/WebSecurityConfig.java
index ef76a8dd31..297c391823 100644
--- a/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/WebSecurityConfig.java
+++ b/spring-security-modules/spring-security-saml/src/main/java/com/baeldung/saml/config/WebSecurityConfig.java
@@ -53,8 +53,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
private SAMLLogoutProcessingFilter samlLogoutProcessingFilter;
- @Autowired
- private SAMLDiscovery samlDiscovery;
+ @Bean
+ public SAMLDiscovery samlDiscovery() {
+ SAMLDiscovery idpDiscovery = new SAMLDiscovery();
+ return idpDiscovery;
+ }
@Autowired
private SAMLAuthenticationProvider samlAuthenticationProvider;
@@ -89,7 +92,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
chains.add(new DefaultSecurityFilterChain(new AntPathRequestMatcher("/saml/SSO/**"),
samlWebSSOProcessingFilter()));
chains.add(new DefaultSecurityFilterChain(new AntPathRequestMatcher("/saml/discovery/**"),
- samlDiscovery));
+ samlDiscovery()));
chains.add(new DefaultSecurityFilterChain(new AntPathRequestMatcher("/saml/login/**"),
samlEntryPoint));
chains.add(new DefaultSecurityFilterChain(new AntPathRequestMatcher("/saml/logout/**"),
@@ -115,21 +118,21 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
http
.csrf()
.disable();
-
+
http
.httpBasic()
.authenticationEntryPoint(samlEntryPoint);
-
+
http
.addFilterBefore(metadataGeneratorFilter(), ChannelProcessingFilter.class)
.addFilterAfter(samlFilter(), BasicAuthenticationFilter.class)
.addFilterBefore(samlFilter(), CsrfFilter.class);
-
+
http
.authorizeRequests()
.antMatchers("/").permitAll()
.anyRequest().authenticated();
-
+
http
.logout()
.addLogoutHandler((request, response, authentication) -> {
diff --git a/spring-security-modules/spring-security-saml/src/main/resources/application.properties b/spring-security-modules/spring-security-saml/src/main/resources/application.properties
index 9da292ee76..f9d6a5df3c 100644
--- a/spring-security-modules/spring-security-saml/src/main/resources/application.properties
+++ b/spring-security-modules/spring-security-saml/src/main/resources/application.properties
@@ -1,6 +1,6 @@
saml.keystore.location=classpath:/saml/samlKeystore.jks
-saml.keystore.password=oktaiscool
-saml.keystore.alias=oktasaml
+saml.keystore.password=
+saml.keystore.alias=
-saml.idp=http://www.okta.com/exk26fxqrz8LLk9dV4x7
+saml.idp=
saml.sp=http://localhost:8080/saml/metadata
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-saml/src/main/resources/templates/home.html b/spring-security-modules/spring-security-saml/src/main/resources/templates/home.html
index efd61019c1..c66e92c1f0 100644
--- a/spring-security-modules/spring-security-saml/src/main/resources/templates/home.html
+++ b/spring-security-modules/spring-security-saml/src/main/resources/templates/home.html
@@ -6,10 +6,8 @@
Welcome!
You are successfully logged in!
You are logged as null.
-
-
- Logout
-
+
+ Logout