Deprecate AUTHENTICATION_CONTEXT_KEY in favor of SECURITY_CONTEXT_KEY

Author: ST-DDT

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/security/interceptors/AuthenticatingServerInterceptor.java

@@ -51,7 +51,10 @@ public interface AuthenticatingServerInterceptor extends ServerInterceptor {
 
     /**
      * The context key that can be used to retrieve the originally associated {@link Authentication}.
+     *
+     * @deprecated Use {@link #SECURITY_CONTEXT_KEY} instead.
      */
+    @Deprecated
     Context.Key<Authentication> AUTHENTICATION_CONTEXT_KEY = Context.key("authentication");
 
 }

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/security/interceptors/DefaultAuthenticatingServerInterceptor.java

@@ -115,6 +115,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(final ServerCall<Re
         final SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
         securityContext.setAuthentication(authentication);
         SecurityContextHolder.setContext(securityContext);
+        @SuppressWarnings("deprecation")
         final Context grpcContext = Context.current().withValues(
                 SECURITY_CONTEXT_KEY, securityContext,
                 AUTHENTICATION_CONTEXT_KEY, authentication);

tests/src/test/java/net/devh/boot/grpc/test/server/TestServiceImpl.java

@@ -184,7 +184,7 @@ protected void assertSameAuthenticatedGrcContextCancellation(final String method
     protected Authentication assertSameAuthenticatedGrcContextOnly(final String method, final Authentication expected,
             final Context context) {
         return assertSameAuthenticated(method, expected,
-                AuthenticatingServerInterceptor.AUTHENTICATION_CONTEXT_KEY.get(context));
+                AuthenticatingServerInterceptor.SECURITY_CONTEXT_KEY.get(context).getAuthentication());
     }
 
     protected Authentication assertSameAuthenticated(final String method, final Authentication expected) {