Merge pull request #1 from majusko/hotfix/overriding-of-existing-toke…

…n-with-internal Added check for existing token.
majusko · Nov 10, 2019 · d6fbd96 · d6fbd96
2 parents 78dfd9a + dafb99b
commit d6fbd96
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/io/github/majusko/grpc/jwt/interceptor/AuthClientInterceptor.java b/src/main/java/io/github/majusko/grpc/jwt/interceptor/AuthClientInterceptor.java
@@ -25,10 +25,12 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
 
             @Override
             public void start(Listener<RespT> responseListener, final Metadata headers) {
+                final String authHeader = headers.get(GrpcHeader.AUTHORIZATION);
 
-                final String internalToken = jwtService.getInternal();
-
-                headers.put(GrpcHeader.AUTHORIZATION, internalToken);
+                if(authHeader == null || authHeader.isEmpty()) {
+                    final String internalToken = jwtService.getInternal();
+                    headers.put(GrpcHeader.AUTHORIZATION, internalToken);
+                }
 
                 final Listener<RespT> tracingResponseListener =
                     new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {