Fix Reactive OAuth2 Kotlin DSL examples

Steve Riesenberg · eleftherias · commit 1896a5e6690f · 2021-12-06T13:05:50.000+01:00
Closes gh-10580
diff --git a/docs/modules/ROOT/pages/reactive/oauth2/client/authorization-grants.adoc b/docs/modules/ROOT/pages/reactive/oauth2/client/authorization-grants.adoc
@@ -162,16 +162,14 @@ class SecurityConfig {
 
     @Bean
     fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             authorizeExchange {
                 authorize(anyExchange, authenticated)
             }
             oauth2Login {
                 authorizationRequestResolver = authorizationRequestResolver(customClientRegistrationRepository)
             }
         }
-
-        return http.build()
     }
 
     private fun authorizationRequestResolver(
@@ -282,13 +280,11 @@ class OAuth2ClientSecurityConfig {
 
     @Bean
     fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Client {
                 authorizationRequestRepository = authorizationRequestRepository()
             }
         }
-
-        return http.build()
     }
 }
 ----
@@ -363,13 +359,11 @@ class OAuth2ClientSecurityConfig {
 
     @Bean
     fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Client {
                 authenticationManager = authorizationCodeAuthenticationManager()
             }
         }
-
-        return http.build()
     }
 
     private fun authorizationCodeAuthenticationManager(): ReactiveAuthenticationManager {
diff --git a/docs/modules/ROOT/pages/reactive/oauth2/client/index.adoc b/docs/modules/ROOT/pages/reactive/oauth2/client/index.adoc
@@ -55,7 +55,7 @@ class OAuth2ClientSecurityConfig {
 
     @Bean
     fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Client {
                 clientRegistrationRepository = clientRegistrationRepository()
                 authorizedClientRepository = authorizedClientRepository()
@@ -64,8 +64,6 @@ class OAuth2ClientSecurityConfig {
                 authenticationManager = authenticationManager()
             }
         }
-
-        return http.build()
     }
 }
 ----
diff --git a/docs/modules/ROOT/pages/reactive/oauth2/login/advanced.adoc b/docs/modules/ROOT/pages/reactive/oauth2/login/advanced.adoc
@@ -60,7 +60,7 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Login {
                 authenticationConverter = authenticationConverter()
                 authenticationMatcher = authenticationMatcher()
@@ -75,8 +75,6 @@ class OAuth2LoginSecurityConfig {
                 securityContextRepository = securityContextRepository()
             }
         }
-
-        return http.build()
     }
 }
 ----
@@ -158,16 +156,14 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             exceptionHandling {
                 authenticationEntryPoint = RedirectServerAuthenticationEntryPoint("/login/oauth2")
             }
             oauth2Login {
                 authorizationRequestResolver = authorizationRequestResolver()
             }
         }
-
-        return http.build()
     }
 
     private fun authorizationRequestResolver(): ServerOAuth2AuthorizationRequestResolver {
@@ -243,13 +239,11 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Login {
                 authenticationMatcher = PathPatternParserServerWebExchangeMatcher("/login/oauth2/callback/{registrationId}")
             }
         }
-
-        return http.build()
     }
 }
 ----
@@ -369,11 +363,9 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Login { }
         }
-
-        return http.build()
     }
 
     @Bean
@@ -458,11 +450,9 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Login { }
         }
-
-        return http.build()
     }
 
     @Bean
@@ -536,11 +526,9 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Login { }
         }
-
-        return http.build()
     }
 
     @Bean
@@ -594,11 +582,9 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             oauth2Login { }
         }
-
-        return http.build()
     }
 
     @Bean
@@ -730,7 +716,7 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             authorizeExchange {
                 authorize(anyExchange, authenticated)
             }
@@ -739,8 +725,6 @@ class OAuth2LoginSecurityConfig {
                 logoutSuccessHandler = oidcLogoutSuccessHandler()
             }
         }
-
-        return http.build()
     }
 
     private fun oidcLogoutSuccessHandler(): ServerLogoutSuccessHandler {
diff --git a/docs/modules/ROOT/pages/reactive/oauth2/login/core.adoc b/docs/modules/ROOT/pages/reactive/oauth2/login/core.adoc
@@ -341,14 +341,12 @@ class OAuth2LoginSecurityConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             authorizeExchange {
                 authorize(anyExchange, authenticated)
             }
             oauth2Login { }
         }
-
-        return http.build()
     }
 }
 ----
@@ -411,14 +409,12 @@ class OAuth2LoginConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             authorizeExchange {
                 authorize(anyExchange, authenticated)
             }
             oauth2Login { }
         }
-
-        return http.build()
     }
 
     @Bean
@@ -505,14 +501,12 @@ class OAuth2LoginConfig {
 
     @Bean
     fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
-        http {
+        return http {
             authorizeExchange {
                 authorize(anyExchange, authenticated)
             }
             oauth2Login { }
         }
-
-        return http.build()
     }
 
     @Bean

Original file line number	Diff line number	Diff line change
`@@ -162,16 +162,14 @@ class SecurityConfig {`
`162`	`162`
`163`	`163`	`@Bean`
`164`	`164`	`fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`165`		`- http {`
	`165`	`+ return http {`
`166`	`166`	`authorizeExchange {`
`167`	`167`	`authorize(anyExchange, authenticated)`
`168`	`168`	`}`
`169`	`169`	`oauth2Login {`
`170`	`170`	`authorizationRequestResolver = authorizationRequestResolver(customClientRegistrationRepository)`
`171`	`171`	`}`
`172`	`172`	`}`
`173`		`-`
`174`		`- return http.build()`
`175`	`173`	`}`
`176`	`174`
`177`	`175`	`private fun authorizationRequestResolver(`
`@@ -282,13 +280,11 @@ class OAuth2ClientSecurityConfig {`
`282`	`280`
`283`	`281`	`@Bean`
`284`	`282`	`fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`285`		`- http {`
	`283`	`+ return http {`
`286`	`284`	`oauth2Client {`
`287`	`285`	`authorizationRequestRepository = authorizationRequestRepository()`
`288`	`286`	`}`
`289`	`287`	`}`
`290`		`-`
`291`		`- return http.build()`
`292`	`288`	`}`
`293`	`289`	`}`
`294`	`290`	`----`
`@@ -363,13 +359,11 @@ class OAuth2ClientSecurityConfig {`
`363`	`359`
`364`	`360`	`@Bean`
`365`	`361`	`fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`366`		`- http {`
	`362`	`+ return http {`
`367`	`363`	`oauth2Client {`
`368`	`364`	`authenticationManager = authorizationCodeAuthenticationManager()`
`369`	`365`	`}`
`370`	`366`	`}`
`371`		`-`
`372`		`- return http.build()`
`373`	`367`	`}`
`374`	`368`
`375`	`369`	`private fun authorizationCodeAuthenticationManager(): ReactiveAuthenticationManager {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class OAuth2ClientSecurityConfig {`
`55`	`55`
`56`	`56`	`@Bean`
`57`	`57`	`fun securityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`58`		`- http {`
	`58`	`+ return http {`
`59`	`59`	`oauth2Client {`
`60`	`60`	`clientRegistrationRepository = clientRegistrationRepository()`
`61`	`61`	`authorizedClientRepository = authorizedClientRepository()`
`@@ -64,8 +64,6 @@ class OAuth2ClientSecurityConfig {`
`64`	`64`	`authenticationManager = authenticationManager()`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`-`
`68`		`- return http.build()`
`69`	`67`	`}`
`70`	`68`	`}`
`71`	`69`	`----`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class OAuth2LoginSecurityConfig {`
`60`	`60`
`61`	`61`	`@Bean`
`62`	`62`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`63`		`- http {`
	`63`	`+ return http {`
`64`	`64`	`oauth2Login {`
`65`	`65`	`authenticationConverter = authenticationConverter()`
`66`	`66`	`authenticationMatcher = authenticationMatcher()`
`@@ -75,8 +75,6 @@ class OAuth2LoginSecurityConfig {`
`75`	`75`	`securityContextRepository = securityContextRepository()`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`-`
`79`		`- return http.build()`
`80`	`78`	`}`
`81`	`79`	`}`
`82`	`80`	`----`
`@@ -158,16 +156,14 @@ class OAuth2LoginSecurityConfig {`
`158`	`156`
`159`	`157`	`@Bean`
`160`	`158`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`161`		`- http {`
	`159`	`+ return http {`
`162`	`160`	`exceptionHandling {`
`163`	`161`	`authenticationEntryPoint = RedirectServerAuthenticationEntryPoint("/login/oauth2")`
`164`	`162`	`}`
`165`	`163`	`oauth2Login {`
`166`	`164`	`authorizationRequestResolver = authorizationRequestResolver()`
`167`	`165`	`}`
`168`	`166`	`}`
`169`		`-`
`170`		`- return http.build()`
`171`	`167`	`}`
`172`	`168`
`173`	`169`	`private fun authorizationRequestResolver(): ServerOAuth2AuthorizationRequestResolver {`
`@@ -243,13 +239,11 @@ class OAuth2LoginSecurityConfig {`
`243`	`239`
`244`	`240`	`@Bean`
`245`	`241`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`246`		`- http {`
	`242`	`+ return http {`
`247`	`243`	`oauth2Login {`
`248`	`244`	`authenticationMatcher = PathPatternParserServerWebExchangeMatcher("/login/oauth2/callback/{registrationId}")`
`249`	`245`	`}`
`250`	`246`	`}`
`251`		`-`
`252`		`- return http.build()`
`253`	`247`	`}`
`254`	`248`	`}`
`255`	`249`	`----`
`@@ -369,11 +363,9 @@ class OAuth2LoginSecurityConfig {`
`369`	`363`
`370`	`364`	`@Bean`
`371`	`365`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`372`		`- http {`
	`366`	`+ return http {`
`373`	`367`	`oauth2Login { }`
`374`	`368`	`}`
`375`		`-`
`376`		`- return http.build()`
`377`	`369`	`}`
`378`	`370`
`379`	`371`	`@Bean`
`@@ -458,11 +450,9 @@ class OAuth2LoginSecurityConfig {`
`458`	`450`
`459`	`451`	`@Bean`
`460`	`452`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`461`		`- http {`
	`453`	`+ return http {`
`462`	`454`	`oauth2Login { }`
`463`	`455`	`}`
`464`		`-`
`465`		`- return http.build()`
`466`	`456`	`}`
`467`	`457`
`468`	`458`	`@Bean`
`@@ -536,11 +526,9 @@ class OAuth2LoginSecurityConfig {`
`536`	`526`
`537`	`527`	`@Bean`
`538`	`528`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`539`		`- http {`
	`529`	`+ return http {`
`540`	`530`	`oauth2Login { }`
`541`	`531`	`}`
`542`		`-`
`543`		`- return http.build()`
`544`	`532`	`}`
`545`	`533`
`546`	`534`	`@Bean`
`@@ -594,11 +582,9 @@ class OAuth2LoginSecurityConfig {`
`594`	`582`
`595`	`583`	`@Bean`
`596`	`584`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`597`		`- http {`
	`585`	`+ return http {`
`598`	`586`	`oauth2Login { }`
`599`	`587`	`}`
`600`		`-`
`601`		`- return http.build()`
`602`	`588`	`}`
`603`	`589`
`604`	`590`	`@Bean`
`@@ -730,7 +716,7 @@ class OAuth2LoginSecurityConfig {`
`730`	`716`
`731`	`717`	`@Bean`
`732`	`718`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`733`		`- http {`
	`719`	`+ return http {`
`734`	`720`	`authorizeExchange {`
`735`	`721`	`authorize(anyExchange, authenticated)`
`736`	`722`	`}`
`@@ -739,8 +725,6 @@ class OAuth2LoginSecurityConfig {`
`739`	`725`	`logoutSuccessHandler = oidcLogoutSuccessHandler()`
`740`	`726`	`}`
`741`	`727`	`}`
`742`		`-`
`743`		`- return http.build()`
`744`	`728`	`}`
`745`	`729`
`746`	`730`	`private fun oidcLogoutSuccessHandler(): ServerLogoutSuccessHandler {`
Original file line number	Diff line number	Diff line change
`@@ -341,14 +341,12 @@ class OAuth2LoginSecurityConfig {`
`341`	`341`
`342`	`342`	`@Bean`
`343`	`343`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`344`		`- http {`
	`344`	`+ return http {`
`345`	`345`	`authorizeExchange {`
`346`	`346`	`authorize(anyExchange, authenticated)`
`347`	`347`	`}`
`348`	`348`	`oauth2Login { }`
`349`	`349`	`}`
`350`		`-`
`351`		`- return http.build()`
`352`	`350`	`}`
`353`	`351`	`}`
`354`	`352`	`----`
`@@ -411,14 +409,12 @@ class OAuth2LoginConfig {`
`411`	`409`
`412`	`410`	`@Bean`
`413`	`411`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`414`		`- http {`
	`412`	`+ return http {`
`415`	`413`	`authorizeExchange {`
`416`	`414`	`authorize(anyExchange, authenticated)`
`417`	`415`	`}`
`418`	`416`	`oauth2Login { }`
`419`	`417`	`}`
`420`		`-`
`421`		`- return http.build()`
`422`	`418`	`}`
`423`	`419`
`424`	`420`	`@Bean`
`@@ -505,14 +501,12 @@ class OAuth2LoginConfig {`
`505`	`501`
`506`	`502`	`@Bean`
`507`	`503`	`fun securityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {`
`508`		`- http {`
	`504`	`+ return http {`
`509`	`505`	`authorizeExchange {`
`510`	`506`	`authorize(anyExchange, authenticated)`
`511`	`507`	`}`
`512`	`508`	`oauth2Login { }`
`513`	`509`	`}`
`514`		`-`
`515`		`- return http.build()`
`516`	`510`	`}`
`517`	`511`
`518`	`512`	`@Bean`