Skip to content

Commit 099d49a

Browse files
committed
Simplify currentAuthentication()
1 parent 40ff837 commit 099d49a

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818

1919
import reactor.core.publisher.Mono;
2020

21-
import org.springframework.security.authentication.AnonymousAuthenticationToken;
2221
import org.springframework.security.core.Authentication;
23-
import org.springframework.security.core.authority.AuthorityUtils;
2422
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
2523
import org.springframework.security.core.context.SecurityContext;
2624
import org.springframework.security.oauth2.core.AbstractOAuth2Token;
@@ -52,9 +50,6 @@
5250
public final class ServerBearerExchangeFilterFunction
5351
implements ExchangeFilterFunction {
5452

55-
private static final AnonymousAuthenticationToken ANONYMOUS_USER_TOKEN = new AnonymousAuthenticationToken("anonymous", "anonymousUser",
56-
AuthorityUtils.createAuthorityList("ROLE_USER"));
57-
5853
/**
5954
* {@inheritDoc}
6055
*/
@@ -75,8 +70,7 @@ private Mono<AbstractOAuth2Token> oauth2Token() {
7570

7671
private Mono<Authentication> currentAuthentication() {
7772
return ReactiveSecurityContextHolder.getContext()
78-
.map(SecurityContext::getAuthentication)
79-
.defaultIfEmpty(ANONYMOUS_USER_TOKEN);
73+
.map(SecurityContext::getAuthentication);
8074
}
8175

8276
private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) {

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818

1919
import reactor.core.publisher.Mono;
2020

21-
import org.springframework.security.authentication.AnonymousAuthenticationToken;
2221
import org.springframework.security.core.Authentication;
23-
import org.springframework.security.core.authority.AuthorityUtils;
2422
import org.springframework.security.core.context.SecurityContextHolder;
2523
import org.springframework.security.oauth2.core.AbstractOAuth2Token;
2624
import org.springframework.web.reactive.function.client.ClientRequest;
@@ -51,9 +49,6 @@
5149
public final class ServletBearerExchangeFilterFunction
5250
implements ExchangeFilterFunction {
5351

54-
private static final AnonymousAuthenticationToken ANONYMOUS_USER_TOKEN = new AnonymousAuthenticationToken("anonymous", "anonymousUser",
55-
AuthorityUtils.createAuthorityList("ROLE_USER"));
56-
5752
/**
5853
* {@inheritDoc}
5954
*/
@@ -73,8 +68,7 @@ private Mono<AbstractOAuth2Token> oauth2Token() {
7368
}
7469

7570
private Mono<Authentication> currentAuthentication() {
76-
return Mono.justOrEmpty(SecurityContextHolder.getContext().getAuthentication())
77-
.defaultIfEmpty(ANONYMOUS_USER_TOKEN);
71+
return Mono.justOrEmpty(SecurityContextHolder.getContext().getAuthentication());
7872
}
7973

8074
private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) {

0 commit comments

Comments
 (0)