From b45e4ff2194360750364fbf561e9b75c92ef9da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20J=2E=20Over=C3=A5?= <k@rl.run>
Date: Tue, 14 May 2024 15:52:16 +0200
Subject: [PATCH] fix: don't reuse octokit between auth methods

---
 src/common/octokit.ts | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/common/octokit.ts b/src/common/octokit.ts
index dbe0c1c..4c5787a 100644
--- a/src/common/octokit.ts
+++ b/src/common/octokit.ts
@@ -5,13 +5,28 @@ import * as R from 'remeda'
 import { log } from './log.ts'
 import { blacklisted } from './repos.ts'
 
-let octokit: Octokit | null = null
+let packagesOctokit: Octokit | null = null
+let cliOctokit: Octokit | null = null
+
 export function getOctokitClient(auth: 'cli' | 'package' = 'cli'): Octokit {
-    if (octokit === null) {
-        octokit = new Octokit({ auth: auth === 'cli' ? getGithubCliToken() : Bun.env.NPM_AUTH_TOKEN })
-    }
+    switch (auth) {
+        case 'cli':
+            if (cliOctokit === null) {
+                cliOctokit = new Octokit({ auth: getGithubCliToken() })
+            }
+
+            return cliOctokit
+        case 'package':
+            if (Bun.env.NPM_AUTH_TOKEN == null) {
+                throw new Error('No NPM_AUTH_TOKEN set')
+            }
 
-    return octokit
+            if (packagesOctokit === null) {
+                packagesOctokit = new Octokit({ auth: Bun.env.NPM_AUTH_TOKEN })
+            }
+
+            return packagesOctokit
+    }
 }
 
 /**