Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify currentAuthentication()

Browse Source
This commit is contained in:
Josh Cummings 2019-09-04 14:51:56 -06:00
parent 40ff837713
commit 099d49aa40
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunction.java
View File

@ -18,9 +18,7 @@ package org.springframework.security.oauth2.server.resource.web.reactive.functio
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.oauth2.core.AbstractOAuth2Token; import org.springframework.security.oauth2.core.AbstractOAuth2Token;
@ -52,9 +50,6 @@ import org.springframework.web.reactive.function.client.ExchangeFunction;
public final class ServerBearerExchangeFilterFunction public final class ServerBearerExchangeFilterFunction
implements ExchangeFilterFunction { implements ExchangeFilterFunction {
private static final AnonymousAuthenticationToken ANONYMOUS_USER_TOKEN = new AnonymousAuthenticationToken("anonymous", "anonymousUser",
AuthorityUtils.createAuthorityList("ROLE_USER"));
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@ -75,8 +70,7 @@ public final class ServerBearerExchangeFilterFunction
private Mono<Authentication> currentAuthentication() { private Mono<Authentication> currentAuthentication() {
return ReactiveSecurityContextHolder.getContext() return ReactiveSecurityContextHolder.getContext()
.map(SecurityContext::getAuthentication) .map(SecurityContext::getAuthentication);
.defaultIfEmpty(ANONYMOUS_USER_TOKEN);
} }
private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) { private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) {

8
oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunction.java
View File

@ -18,9 +18,7 @@ package org.springframework.security.oauth2.server.resource.web.reactive.functio
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.core.AbstractOAuth2Token; import org.springframework.security.oauth2.core.AbstractOAuth2Token;
import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientRequest;
@ -51,9 +49,6 @@ import org.springframework.web.reactive.function.client.ExchangeFunction;
public final class ServletBearerExchangeFilterFunction public final class ServletBearerExchangeFilterFunction
implements ExchangeFilterFunction { implements ExchangeFilterFunction {
private static final AnonymousAuthenticationToken ANONYMOUS_USER_TOKEN = new AnonymousAuthenticationToken("anonymous", "anonymousUser",
AuthorityUtils.createAuthorityList("ROLE_USER"));
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@ -73,8 +68,7 @@ public final class ServletBearerExchangeFilterFunction
} }
private Mono<Authentication> currentAuthentication() { private Mono<Authentication> currentAuthentication() {
return Mono.justOrEmpty(SecurityContextHolder.getContext().getAuthentication()) return Mono.justOrEmpty(SecurityContextHolder.getContext().getAuthentication());
.defaultIfEmpty(ANONYMOUS_USER_TOKEN);
} }
private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) { private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) {