From a29a2d9b7db047bd54b754dec50b43f7b3dd49af Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Wed, 6 Mar 2024 19:07:35 +0100 Subject: [PATCH 1/2] Fix GitHub authentication --- .../java/io/jenkins/update_center/GitHubSource.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/jenkins/update_center/GitHubSource.java b/src/main/java/io/jenkins/update_center/GitHubSource.java index 1a6d36102..67af96eae 100644 --- a/src/main/java/io/jenkins/update_center/GitHubSource.java +++ b/src/main/java/io/jenkins/update_center/GitHubSource.java @@ -58,14 +58,7 @@ protected void initializeOrganizationData(String organization) throws IOExceptio this.repoNames = new TreeSet<>(String::compareToIgnoreCase); LOGGER.log(Level.INFO, "Retrieving GitHub repo data..."); - OkHttpClient.Builder builder = new OkHttpClient.Builder(); - if (GITHUB_API_USERNAME != null && GITHUB_API_PASSWORD != null) { - builder.authenticator((route, response) -> { - String credential = Credentials.basic(GITHUB_API_USERNAME, GITHUB_API_PASSWORD); - return response.request().newBuilder().header("Authorization", credential).build(); - }); - } - OkHttpClient client = builder.build(); + OkHttpClient client = new OkHttpClient.Builder().build(); boolean hasNextPage = true; String endCursor = null; @@ -108,6 +101,7 @@ protected void initializeOrganizationData(String organization) throws IOExceptio Request request = new Request.Builder() .url(this.getGraphqlUrl()) + .header("Authorization", Credentials.basic(GITHUB_API_USERNAME, GITHUB_API_PASSWORD)) .post(RequestBody.create(jsonObject.toString(), MediaType.parse("application/json; charset=utf-8"))) .build(); From 63a4005b9c0ae0542a389d2a363a4386b3d0e4d9 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Thu, 7 Mar 2024 09:49:23 +0100 Subject: [PATCH 2/2] Make the test pass even without env vars set --- .../java/io/jenkins/update_center/GitHubSource.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/jenkins/update_center/GitHubSource.java b/src/main/java/io/jenkins/update_center/GitHubSource.java index 67af96eae..7c5d3ff78 100644 --- a/src/main/java/io/jenkins/update_center/GitHubSource.java +++ b/src/main/java/io/jenkins/update_center/GitHubSource.java @@ -99,11 +99,13 @@ protected void initializeOrganizationData(String organization) throws IOExceptio )); LOGGER.log(Level.FINE, String.format("Retrieving GitHub topics with end token... %s", endCursor)); - Request request = new Request.Builder() + Request.Builder builder = new Request.Builder() .url(this.getGraphqlUrl()) - .header("Authorization", Credentials.basic(GITHUB_API_USERNAME, GITHUB_API_PASSWORD)) - .post(RequestBody.create(jsonObject.toString(), MediaType.parse("application/json; charset=utf-8"))) - .build(); + .post(RequestBody.create(jsonObject.toString(), MediaType.parse("application/json; charset=utf-8"))); + if (GITHUB_API_PASSWORD != null && GITHUB_API_USERNAME != null) { + builder = builder.header("Authorization", Credentials.basic(GITHUB_API_USERNAME, GITHUB_API_PASSWORD)); + } + Request request = builder.build(); String bodyString = HttpHelper.getResponseBody(client, request);