Merge pull request #126 from github/actions-bot-user-fixes

properly fetch "login" when using Actions tokens instead of a PAT
github · Nov 28, 2023 · 365f527 · 365f527
2 parents 245059b + 9070ff7
commit 365f527
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/github-provider.js b/src/github-provider.js
@@ -11,9 +11,32 @@ class GitHubProvider {
   }
 
   async getCurrentUser() {
-    const { data: currentUser } =
-      await this.octokit.rest.users.getAuthenticated();
-    return currentUser.login;
+    let login;
+    try {
+      core.debug(
+        `attempting to get current user via octokit.rest.users.getAuthenticated()`,
+      );
+      const { data: currentUser } =
+        await this.octokit.rest.users.getAuthenticated();
+      login = currentUser.login;
+      core.debug(
+        "obtained current user via octokit.rest.users.getAuthenticated()",
+      );
+    } catch (error) {
+      core.debug(error);
+      core.debug(
+        `octokit.rest.users.getAuthenticated() failed, trying with octokit.rest.apps.getAuthenticated() instead`,
+      );
+      const { data: currentApp } =
+        await this.octokit.rest.apps.getAuthenticated();
+      login = currentApp.slug;
+      core.debug(
+        "obtained current user via octokit.rest.apps.getAuthenticated()",
+      );
+    }
+
+    core.debug(`current user: ${login}`);
+    return login;
   }
 
   // check if the current authenticated user (login) has an active APPROVED review on the PR