From 43fbd9d3456d0471c31be624415e27d2709ce865 Mon Sep 17 00:00:00 2001
From: Joe Grandja <jgrandja@vmware.com>
Date: Thu, 19 Nov 2020 15:05:25 -0500
Subject: [PATCH] Register SecurityFilterChain in sample

Issue gh-163
---
 .../java/sample/config/SecurityConfig.java    | 37 ++++++++++---------
 .../sample/config/ResourceServerConfig.java   | 19 ++++++----
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java b/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java
index 77ce385c..679b1144 100644
--- a/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java
+++ b/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java
@@ -15,37 +15,38 @@
  */
 package sample.config;
 
+import org.springframework.context.annotation.Bean;
 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.config.annotation.web.configuration.WebSecurityCustomizer;
+import org.springframework.security.web.SecurityFilterChain;
+
+import static org.springframework.security.config.Customizer.withDefaults;
 
 /**
  * @author Joe Grandja
  * @since 0.0.1
  */
 @EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
+public class SecurityConfig {
 
-	// @formatter:off
-	@Override
-	public void configure(WebSecurity web) {
-		web
-			.ignoring()
-				.antMatchers("/webjars/**");
+	@Bean
+	WebSecurityCustomizer webSecurityCustomizer() {
+		return (web) -> web.ignoring().antMatchers("/webjars/**");
 	}
-	// @formatter:on
 
-	// @formatter:off
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	// formatter:off
+	@Bean
+	SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests()
-				.anyRequest().permitAll()
-				.and()
+			.authorizeRequests(authorizeRequests ->
+				authorizeRequests.anyRequest().permitAll()
+			)
 			.logout()
 				.disable()
-			.oauth2Client();
+			.oauth2Client(withDefaults());
+		return http.build();
 	}
-	// @formatter:on
+	// formatter:on
+
 }
diff --git a/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/config/ResourceServerConfig.java b/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/config/ResourceServerConfig.java
index 6dd88686..5759f284 100644
--- a/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/config/ResourceServerConfig.java
+++ b/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/config/ResourceServerConfig.java
@@ -15,27 +15,30 @@
  */
 package sample.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 
 /**
  * @author Joe Grandja
  * @since 0.0.1
  */
 @EnableWebSecurity
-public class ResourceServerConfig extends WebSecurityConfigurerAdapter {
+public class ResourceServerConfig {
 
-	// @formatter:off
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	// formatter:off
+	@Bean
+	SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		http
 			.mvcMatcher("/messages/**")
 				.authorizeRequests()
 					.mvcMatchers("/messages/**").access("hasAuthority('SCOPE_message.read')")
 					.and()
-				.oauth2ResourceServer()
-					.jwt();
+			.oauth2ResourceServer()
+				.jwt();
+		return http.build();
 	}
-	// @formatter:on
+	// formatter:on
+
 }