use single method to resolve authentication

Author: koenpunt

spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AuthenticationPrincipalArgumentResolver.java

@@ -96,7 +96,7 @@ private static AuthenticationPrincipal findMethodAnnotation(MethodParameter para
 
 @Override
 public Object resolveArgument(MethodParameter parameter, DataFetchingEnvironment environment) throws Exception {
-return getCurrentAuthentication()
+return PrincipalMethodArgumentResolver.doResolve(parameter.isOptional())
 .flatMap(auth -> Mono.justOrEmpty(resolvePrincipal(parameter, auth.getPrincipal())))
 .transform((argument) -> isParameterMonoAssignable(parameter) ? Mono.just(argument) : argument);
 }
@@ -106,11 +106,6 @@ private static boolean isParameterMonoAssignable(MethodParameter parameter) {
 return (Publisher.class.equals(type) || Mono.class.equals(type));
 }
 
-private Mono<Authentication> getCurrentAuthentication() {
-return Mono.justOrEmpty(SecurityContextHolder.getContext().getAuthentication())
-.switchIfEmpty(ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication));
-}
-
 @Nullable
 private Object resolvePrincipal(MethodParameter parameter, Object principal) {
 AuthenticationPrincipal annotation = findMethodAnnotation(parameter);

spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/PrincipalMethodArgumentResolver.java

@@ -57,14 +57,9 @@ public Object resolveArgument(MethodParameter parameter, DataFetchingEnvironment
 return doResolve(parameter.isOptional());
 }
 
-static Object doResolve(boolean optional) {
-Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-
-if (authentication != null) {
-return authentication;
-}
-
-return ReactiveSecurityContextHolder.getContext()
+static Mono<Authentication> doResolve(boolean optional) {
+return Mono.justOrEmpty(SecurityContextHolder.getContext())
+.switchIfEmpty(ReactiveSecurityContextHolder.getContext())
 .switchIfEmpty(optional ? Mono.empty() : Mono.error(new AuthenticationCredentialsNotFoundException("SecurityContext not available")))
 .handle((context, sink) -> {
 Authentication auth = context.getAuthentication();