Only create a new request on expired tokens

Author: emrebasar

src/main/java/org/kohsuke/github/GitHubClient.java

@@ -422,9 +422,8 @@ public <T> GitHubResponse<T> sendRequest(@Nonnull GitHubRequest.Builder<?> build
     public <T> GitHubResponse<T> sendRequest(GitHubRequest request, @CheckForNull BodyHandler<T> handler)
             throws IOException {
         int retries = CONNECTION_ERROR_RETRIES;
-
+        GitHubConnectorRequest connectorRequest = prepareConnectorRequest(request);
         do {
-            GitHubConnectorRequest connectorRequest = prepareConnectorRequest(request);
             GitHubConnectorResponse connectorResponse = null;
             try {
                 logRequest(connectorRequest);
@@ -461,6 +460,7 @@ private void detectKnownErrors(GitHubConnectorResponse connectorResponse,
             boolean detectStatusCodeError) throws IOException {
         detectOTPRequired(connectorResponse);
         detectInvalidCached404Response(connectorResponse, request);
+        detectExpiredToken(connectorResponse, request);
         detectRedirect(connectorResponse);
         if (rateLimitHandler.isError(connectorResponse)) {
             rateLimitHandler.onError(connectorResponse);
@@ -474,6 +474,22 @@ private void detectKnownErrors(GitHubConnectorResponse connectorResponse,
         }
     }
 
+    private void detectExpiredToken(GitHubConnectorResponse connectorResponse, GitHubRequest request)
+            throws IOException {
+        if (connectorResponse.statusCode() != HTTP_UNAUTHORIZED) {
+            return;
+        }
+        String originalAuthorization = connectorResponse.request().header("Authorization");
+        if (Objects.isNull(originalAuthorization) || originalAuthorization.isEmpty()) {
+            return;
+        }
+        GitHubConnectorRequest updatedRequest = prepareConnectorRequest(request);
+        String updatedAuthorization = updatedRequest.header("Authorization");
+        if (!originalAuthorization.equals(updatedAuthorization)) {
+            throw new RetryRequestException(updatedRequest);
+        }
+    }
+
     private void detectRedirect(GitHubConnectorResponse connectorResponse) throws IOException {
         if (connectorResponse.statusCode() == HTTP_MOVED_PERM || connectorResponse.statusCode() == HTTP_MOVED_TEMP) {
             // GitHubClient depends on GitHubConnector implementations to follow any redirects automatically