Merge branch '6.x' into issue-1067

jmini · Nov 6, 2024 · 3134e9a · 3134e9a
2 parents 8586ea5 + b0e731a
commit 3134e9a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/GitLabApiClient.java b/gitlab4j-api/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.
      */

diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java
@@ -73,6 +73,7 @@ public String toString() {
     private String title;
     private Integer userNotesCount;
     private String webUrl;
+    private References references;
     private Integer weight;
     private Boolean discussionLocked;
     private TimeStats timeStats;
@@ -272,6 +273,14 @@ public void setWebUrl(String webUrl) {
         this.webUrl = webUrl;
     }
 
+    public References getReferences() {
+        return references;
+    }
+
+    public void setReferences(References references) {
+        this.references = references;
+    }
+
     public Integer getWeight() {
         return weight;
     }

diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/models/Constants.java b/gitlab4j-models/src/main/java/org/gitlab4j/models/Constants.java
@@ -50,6 +50,7 @@ public interface Constants {
     public enum TokenType {
         ACCESS,
         OAUTH2_ACCESS,
+        JOB_TOKEN,
         PRIVATE;
     }
 

diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/api/issue.json b/gitlab4j-models/src/test/resources/org/gitlab4j/api/issue.json
@@ -40,10 +40,15 @@
       "id" : 1,
       "name" : "Administrator"
    },
+   "references": {
+       "short": "#1",
+       "relative": "#1",
+       "full": "example/example#1"
+   },
    "severity": "UNKNOWN",
    "subscribed": false,
    "user_notes_count": 1,
-   "web_url": "http://example.com/example/example/issues/1",
+   "web_url": "http://example.com/example/example/-/issues/1",
    "confidential": false,
    "time_stats": {
       "time_estimate": 12600,