fix getUseData for apps that aren't bots

Author: gossi

src/changelog.ts

@@ -129,12 +129,14 @@ export default class Changelog {
 
     for (const commit of commits) {
       const issue = commit.githubIssue;
-      const login = issue && issue.user && issue.user.login;
+      const user = issue && issue.user;
+      const login = user && user.login;
       // If a list of `ignoreCommitters` is provided in the lerna.json config
       // check if the current committer should be kept or not.
       const shouldKeepCommiter = login && !this.ignoreCommitter(login);
+
       if (login && shouldKeepCommiter && !committers[login]) {
-        committers[login] = await this.github.getUserData(login);
+        committers[login] = await this.github.getUserData(user);
       }
     }
 

src/github-api.spec.ts

@@ -17,12 +17,15 @@ describe("github api", function () {
     };
     expect(github.getBaseIssueUrl("foo")).toEqual(`https://github.host.com/foo/issues/`);
 
-    github.getUserData("foo");
+    github.getUserData({ login: "foo", html_url: "" });
     expect(fetchedUrl).toEqual(`https://api.github.host.com/users/foo`);
 
     github.getIssueData("foo", "2");
     expect(fetchedUrl).toEqual(`https://api.github.host.com/repos/foo/issues/2`);
 
+    github.getUserData({ login: "Copilot", html_url: "https://github.com/apps/copilot-swe-agent" });
+    expect(fetchedUrl).toEqual(`https://api.github.host.com/apps/copilot-swe-agent`);
+
     delete process.env.GITHUB_DOMAIN;
 
     process.env.GITHUB_API_URL = "https://api.github.host2.com";
@@ -36,7 +39,7 @@ describe("github api", function () {
     };
     expect(github.getBaseIssueUrl("foo")).toEqual(`https://github.com/foo/issues/`);
 
-    github.getUserData("foo");
+    github.getUserData({ login: "foo", html_url: "" });
     expect(fetchedUrl).toEqual(`https://api.github.host2.com/users/foo`);
 
     github.getIssueData("foo", "2");

src/github-api.ts

@@ -3,12 +3,15 @@ const path = require("path");
 import ConfigurationError from "./configuration-error";
 import fetch from "./fetch";
 
-export interface GitHubUserResponse {
+interface GithubUserInfo {
   login: string;
-  name: string;
   html_url: string;
 }
 
+export interface GitHubUserResponse extends GithubUserInfo {
+  name: string;
+}
+
 export interface GitHubIssueResponse {
   number: number;
   title: string;
@@ -18,10 +21,7 @@ export interface GitHubIssueResponse {
   labels: Array<{
     name: string;
   }>;
-  user: {
-    login: string;
-    html_url: string;
-  };
+  user: GithubUserInfo;
 }
 
 export interface Options {
@@ -54,9 +54,16 @@ export default class GithubAPI {
     return this._fetch(`${prefix}/repos/${repo}/issues/${issue}`);
   }
 
-  public async getUserData(login: string): Promise<GitHubUserResponse> {
+  public async getUserData(userInfo: GithubUserInfo): Promise<GitHubUserResponse> {
+    let login = userInfo.login;
+    let path = "users";
+
+    if (userInfo.html_url && userInfo.html_url.includes("/apps/")) {
+      path = "apps";
+      login = userInfo.html_url.split("/").pop() as string;
+    }
     const prefix = process.env.GITHUB_API_URL || `https://api.${this.github}`;
-    return this._fetch(`${prefix}/users/${login}`);
+    return this._fetch(`${prefix}/${path}/${login}`);
   }
 
   private async _fetch(url: string): Promise<any> {