Merge pull request #3599 from mevan-karu/pat_impl_choreo

Improve x-forwarded-authorization header setting logic

Author: renuka-fernando

enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java

@@ -818,6 +818,7 @@ private String exchangeJWTForPAT(RequestContext requestContext, String pat) thro
             if (log.isDebugEnabled()) {
                 log.debug("Token retrieved from the cache. Token: " + FilterUtils.getMaskedToken(pat));
             }
+            setXForwardedAuthorizationHeader(requestContext, (String) cachedJWT);
             return (String) cachedJWT;
         }
         Optional<String> jwt = APIKeyUtils.exchangePATToJWT(keyHash);
@@ -828,10 +829,14 @@ private String exchangeJWTForPAT(RequestContext requestContext, String pat) thro
         }
         CacheProvider.getGatewayAPIKeyJWTCache().put(keyHash, jwt.get());
         // Add jwt to x-forwarded-authorization header.
-        requestContext.addOrModifyHeaders("x-forwarded-authorization", jwt.get());
+        setXForwardedAuthorizationHeader(requestContext, jwt.get());
         return jwt.get();
     }
 
+    private void setXForwardedAuthorizationHeader(RequestContext requestContext, String jwt) {
+        requestContext.addOrModifyHeaders("x-forwarded-authorization", String.format("Bearer %s", jwt));
+    }
+
     public String extractJWTInWSProtocolHeader(RequestContext requestContext) {
         String protocolHeader = requestContext.getHeaders().get(
                 HttpConstants.WEBSOCKET_PROTOCOL_HEADER);