Merge remote-tracking branch 'origin/main' into 6.x

Author: jmini

src/main/java/org/gitlab4j/api/Constants.java

@@ -50,6 +50,7 @@ public interface Constants {
     public enum TokenType {
         ACCESS,
         OAUTH2_ACCESS,
+        JOB_TOKEN,
         PRIVATE;
     }
 

src/main/java/org/gitlab4j/api/GitLabApiClient.java

@@ -57,6 +57,7 @@
 public class GitLabApiClient implements AutoCloseable {
 
     protected static final String PRIVATE_TOKEN_HEADER = "PRIVATE-TOKEN";
+    protected static final String JOB_TOKEN_HEADER = "JOB-TOKEN";
     protected static final String SUDO_HEADER = "Sudo";
     protected static final String AUTHORIZATION_HEADER = "Authorization";
     protected static final String X_GITLAB_TOKEN_HEADER = "X-Gitlab-Token";
@@ -862,8 +863,8 @@ protected Invocation.Builder invocation(URL url, MultivaluedMap<String, String>
             }
         }
 
-        String authHeader = (tokenType == TokenType.OAUTH2_ACCESS ? AUTHORIZATION_HEADER : PRIVATE_TOKEN_HEADER);
-        String authValue = (tokenType == TokenType.OAUTH2_ACCESS ? "Bearer " + authToken.get() : authToken.get());
+        String authHeader = getAuthHeader();
+        String authValue = getAuthValue();
         Invocation.Builder builder = target.request();
         if (accept == null || accept.trim().length() == 0) {
             builder = builder.header(authHeader, authValue);
@@ -887,6 +888,26 @@ protected Invocation.Builder invocation(URL url, MultivaluedMap<String, String>
         return (builder);
     }
 
+    private String getAuthValue() {
+        switch (tokenType) {
+            case OAUTH2_ACCESS:
+                return "Bearer " + authToken.get();
+            default:
+                return authToken.get();
+        }
+    }
+
+    private String getAuthHeader() {
+        switch (tokenType) {
+            case OAUTH2_ACCESS:
+                return AUTHORIZATION_HEADER;
+            case JOB_TOKEN:
+                return JOB_TOKEN_HEADER;
+            default:
+                return PRIVATE_TOKEN_HEADER;
+        }
+    }
+
     /**
      * Used to set the host URL to be used by OAUTH2 login in GitLabApi.
      */