Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-12 13:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of Mono.deferWithContext()

Browse Source 
Closes gh-8901
This commit is contained in:
Joe Grandja 2020-07-28 11:44:57 -04:00
parent dfaf251970
commit 4e5a304a8a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java
View File

@ -139,14 +139,13 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React
.defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null ? .defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null ?
authorizeRequest.getAuthorizedClient() : authorizedClient); authorizeRequest.getAuthorizedClient() : authorizedClient);
}) })
.switchIfEmpty(Mono.deferWithContext(context -> .switchIfEmpty(Mono.defer(() ->
// Authorize // Authorize
this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId)
.switchIfEmpty(Mono.error(() -> new IllegalArgumentException( .switchIfEmpty(Mono.error(() -> new IllegalArgumentException(
"Could not find ClientRegistration with id '" + clientRegistrationId + "'"))) "Could not find ClientRegistration with id '" + clientRegistrationId + "'")))
.flatMap(clientRegistration -> authorizationContext(authorizeRequest, clientRegistration)) .flatMap(clientRegistration -> authorizationContext(authorizeRequest, clientRegistration))
.flatMap(authorizationContext -> authorize(authorizationContext, principal, serverWebExchange)) .flatMap(authorizationContext -> authorize(authorizationContext, principal, serverWebExchange))
.subscriberContext(context)
) )
)); ));
} }

3
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java
View File

@ -540,14 +540,13 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements
.defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null ? .defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null ?
authorizeRequest.getAuthorizedClient() : authorizedClient); authorizeRequest.getAuthorizedClient() : authorizedClient);
}) })
.switchIfEmpty(Mono.deferWithContext(context -> .switchIfEmpty(Mono.defer(() ->
// Authorize // Authorize
this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId)
.switchIfEmpty(Mono.error(() -> new IllegalArgumentException( .switchIfEmpty(Mono.error(() -> new IllegalArgumentException(
"Could not find ClientRegistration with id '" + clientRegistrationId + "'"))) "Could not find ClientRegistration with id '" + clientRegistrationId + "'")))
.flatMap(clientRegistration -> Mono.just(OAuth2AuthorizationContext.withClientRegistration(clientRegistration).principal(principal).build())) .flatMap(clientRegistration -> Mono.just(OAuth2AuthorizationContext.withClientRegistration(clientRegistration).principal(principal).build()))
.flatMap(authorizationContext -> authorize(authorizationContext, principal)) .flatMap(authorizationContext -> authorize(authorizationContext, principal))
.subscriberContext(context)
)); ));
} }