feat: use octokit-from-auth for optional auth token

package.json

@@ -40,7 +40,8 @@
 		"co-author-to-username": "^0.1.1",
 		"conventional-commits-parser": "^6.0.0",
 		"description-to-co-authors": "^0.3.0",
-		"octokit": "^4.0.0"
+		"octokit": "^4.0.0",
+		"octokit-from-auth": "^0.3.0"
 	},
 	"devDependencies": {
 		"@release-it/conventional-changelog": "^9.0.0",

src/collect/api.ts

@@ -1,4 +1,5 @@
 import { Octokit } from "octokit";
+import { octokitFromAuthSafe } from "octokit-from-auth";
 
 const perPage = 100;
 
@@ -7,13 +8,16 @@ export interface RequestDefaults {
 	repo: string;
 }
 
-export function createOctokit(auth: string | undefined): Octokit {
-	return new (Octokit.defaults({
+export async function createOctokit(
+	auth: string | undefined,
+): Promise<Octokit> {
+	return await octokitFromAuthSafe({
+		auth,
 		headers: {
 			"X-GitHub-Api-Version": "2022-11-28",
 		},
 		per_page: perPage,
-	}))({ auth });
+	});
 }
 
 export interface RequestOptionsWithPage extends RequestDefaults {

src/collect/index.ts

@@ -13,7 +13,7 @@ export async function collect(
 	options: AllContributorsForRepositoryOptions,
 ): Promise<ContributorsContributions> {
 	const defaults = { owner: options.owner, repo: options.repo };
-	const octokit = createOctokit(options.auth);
+	const octokit = await createOctokit(options.auth);
 
 	// 1. Collect event data from the GitHub API
 	const [acceptedIssues, issueEvents, mergedPulls, repoEvents] =

src/index.test.ts

@@ -61,13 +61,15 @@ const mockRequest = (url: string) => {
 	}
 };
 
-vi.mock("octokit", () => ({
-	get Octokit() {
-		return class MockOctokit {
+vi.mock("octokit-from-auth", () => ({
+	octokitFromAuthSafe() {
+		class MockOctokit {
 			static defaults = () => MockOctokit;
 
 			request = mockRequest;
-		};
+		}
+
+		return Promise.resolve(new MockOctokit());
 	},
 }));