make graphQL call with hygieia token if 401 when using collectorItemT…

…oken (#118)
hygieia · Sep 23, 2022 · 1f3f15f · 1f3f15f
1 parent 412dba4
commit 1f3f15f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
  </description>
  <url>https://github.com/Hygieia/${repository.name}</url>
  <packaging>jar</packaging>
- <version>3.3.19-SNAPSHOT</version>
+ <version>3.3.20-SNAPSHOT</version>
 
 
  <parent>

diff --git a/src/main/java/com/capitalone/dashboard/collector/DefaultGitHubClient.java b/src/main/java/com/capitalone/dashboard/collector/DefaultGitHubClient.java
@@ -1344,16 +1344,21 @@ private JSONObject getDataFromRestCallPost(GitHubParsed gitHubParsed, GitHubRepo
  }
 
  private ResponseEntity<String> makeRestCallPost(String url, String userId, String password, String personalAccessToken, JSONObject query) {
+ ResponseEntity<String> response;
  // Basic Auth only.
  if (!Objects.equals("", userId) && !Objects.equals("", password)) {
  RestUserInfo userInfo = new RestUserInfo(userId, password);
- return restClient.makeRestCallPost(url, userInfo, query);
+ response = restClient.makeRestCallPost(url, userInfo, query);
  } else if (personalAccessToken != null && !Objects.equals("", personalAccessToken)) {
- return restClient.makeRestCallPost(url, "token", personalAccessToken, query);
+ response = restClient.makeRestCallPost(url, "token", personalAccessToken, query);
+ if (Objects.nonNull(response) && response.getStatusCode() != HttpStatus.OK) {
+ response = restClient.makeRestCallPost(url, "token", settings.getPersonalAccessToken(), query);
+ }
  } else {
  // This handles the case when settings.getPersonalAccessToken() is empty
- return restClient.makeRestCallPost(url, "token", settings.getPersonalAccessToken(), query);
+ response = restClient.makeRestCallPost(url, "token", settings.getPersonalAccessToken(), query);
  }
+ return response;
  }
 
  private ResponseEntity<String> makeRestCallGet(String url) throws RestClientException {