finish #93

Author: Oussama Zgheb

src/main/java/app/tokenposition/AuthorizationBearerHeader.java

@@ -25,6 +25,7 @@ public boolean positionFound() {
 			for (HttpHeader header : httpMessage.headers()) {
 				containedJwt = containsJwt(header.value(), List.of("Bearer","bearer","BEARER"));
 				if (containedJwt.isPresent()) {
+					headerName = header.name();
 					this.token = containedJwt.get();
 					return true;
 				}
@@ -40,13 +41,15 @@ private Optional<String> containsJwt(String headerValue, List<String> jwtKeyword
 			if (headerValue.startsWith(keyword)) {
 				String potentialJwt = headerValue.replace(keyword, "").trim();
 				if (CustomJWToken.isValidJWT(potentialJwt)) {
+					headerKeyword = keyword;
 					return Optional.of(potentialJwt);
 				}
 			}
 		}
 		if(headerValue.toLowerCase().startsWith("ey") || containsExactlyTwoDots(headerValue)) {
 			String potentialJwt = headerValue.trim();
 			if (CustomJWToken.isValidJWT(potentialJwt)) {
+				headerKeyword = "";
 				return Optional.of(potentialJwt);
 			}
 		}
@@ -59,7 +62,7 @@ public HttpRequest getRequest() {
 		if (containedJwt.isEmpty()) {
 			return httpRequest;
 		}
-		return httpRequest.withUpdatedHeader(headerName, headerKeyword + " " + token);
+		return httpRequest.withUpdatedHeader(headerName, headerKeyword + needsSpace(headerKeyword) + token);
 	}
 
 	@Override
@@ -68,9 +71,15 @@ public HttpResponse getResponse() {
 		if (containedJwt.isEmpty()) {
 			return httpResponse;
 		}
-		return httpResponse.withUpdatedHeader(headerName, headerKeyword + " " + token);
+		return httpResponse.withUpdatedHeader(headerName, headerKeyword + needsSpace(headerKeyword) + token);
 	}
 
+
+	private String needsSpace(String headerKeyword) {
+		return headerKeyword.equals("")?"":" ";
+	}
+
+	
 	private boolean containsExactlyTwoDots(String str) {
 	    int firstDotIndex = str.indexOf('.');
 	    if (firstDotIndex == -1) {