fixup! Pass status to Exception on Unauthorised to GitHub Error

eclipse-che · Nov 29, 2023 · 13e36c5 · 13e36c5
1 parent 0fbd872
commit 13e36c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...mmon/src/main/java/org/eclipse/che/api/factory/server/github/AbstractGithubURLParser.java b/...mmon/src/main/java/org/eclipse/che/api/factory/server/github/AbstractGithubURLParser.java
@@ -126,7 +126,10 @@ private boolean isApiRequestRelevant(String repositoryUrl) {
         // belongs to GitHub.
         githubApiClient.getUser("");
       } catch (ScmCommunicationException e) {
-        return e.getStatusCode() == HTTP_UNAUTHORIZED;
+        return e.getStatusCode() == HTTP_UNAUTHORIZED
+            // Check the error message as well, because other providers might also return 401 for
+            // such requests.
+            && e.getMessage().contains("Must authenticate to access this API.");
       } catch (ScmItemNotFoundException | ScmBadRequestException | IllegalArgumentException e) {
         return false;
       }

diff --git a/...ithub-common/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java b/...ithub-common/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java
@@ -287,7 +287,7 @@ private <T> T executeRequest(
             throw new ScmItemNotFoundException(body);
           default:
             throw new ScmCommunicationException(
-                "Unexpected status code " + statusCode + " " + response.toString(), statusCode);
+                "Unexpected status code " + statusCode + " " + body, statusCode);
         }
       }
     } catch (IOException | InterruptedException | UncheckedIOException e) {

diff --git a/...y-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubURLParserTest.java b/...y-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubURLParserTest.java
@@ -337,7 +337,12 @@ public void shouldParseServerUrWithPullRequestId() throws Exception {
   public void shouldValidateGitHubServerUrl() throws Exception {
     // given
     String url = wireMockServer.url("/user/repo");
-    stubFor(get(urlEqualTo("/api/v3/user")).willReturn(aResponse().withStatus(HTTP_UNAUTHORIZED)));
+    stubFor(
+        get(urlEqualTo("/api/v3/user"))
+            .willReturn(
+                aResponse()
+                    .withStatus(HTTP_UNAUTHORIZED)
+                    .withBody("{\"message\": \"Must authenticate to access this API.\",\n}")));
 
     // when
     boolean valid = githubUrlParser.isValid(url);