feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wyattjoh merged 9 commits into from
Apr 22, 2026
Merged

feat(auth): add OAuth refresh token session handling #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b2350a
feat(auth): add OAuth refresh token session handling
wyattjoh Apr 21, 2026
3a9de4b
fix(doctor): validate refreshed oauth sessions
wyattjoh Apr 22, 2026
96b5b30
fix(auth): centralize auth error handling
wyattjoh Apr 22, 2026
9f939c0
docs(changeset): refresh expired OAuth sessions automatically for aut…
wyattjoh Apr 22, 2026
75b394a
test(auth): fix refreshed session test coverage
wyattjoh Apr 22, 2026
aa25592
fix(init): use hasStoredCredentials in isAuthenticated
wyattjoh Apr 22, 2026
026c76c
fix(auth): use stored session expiry metadata
wyattjoh Apr 22, 2026
e4daff6
fix(auth): require refresh tokens in stored sessions
wyattjoh Apr 22, 2026
9991c0c
fix(auth): log OAuth session refreshes
wyattjoh Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/oauth-refresh-token-support.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.
1 change: 1 addition & 0 deletions packages/cli-core/src/commands/api/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
...credentialStoreStubs,
getToken: async () => mockStoredToken,
getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down
142 changes: 119 additions & 23 deletions packages/cli-core/src/commands/auth/login.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
storeToken: (...args: unknown[]) => mockStoreToken(...args),
createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
...actualEnvironment,
getOAuthConfig: () => ({
clientId: "test-client-id",
scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
...actualConstants,
CALLBACK_PATH: "/callback",
AUTH_TIMEOUT_MS: 120000,
CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

afterEach(() => {
captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
mockStoreToken.mockReset();
mockCreateOAuthSession.mockReset();
mockGetAuth.mockReset();
mockSetAuth.mockReset();
mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
}

test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
mockGetAuth.mockResolvedValue({ userId: "user_123" });
mockFetchUserInfo.mockResolvedValue({
userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
});

test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
codeVerifier: "test-code-verifier",
redirectUri: "http://127.0.0.1:54321/callback",
});
expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
expect(mockCreateOAuthSession).toHaveBeenCalledWith({
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
expect(mockStoreToken).toHaveBeenCalledWith({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
expect(captured.err).toContain("Logged in as new@example.com");
});

test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
mockGetAuth.mockResolvedValue({ userId: "user_old" });
mockFetchUserInfo
.mockRejectedValueOnce(new Error("Token expired"))
.mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
mockFetchUserInfo.mockResolvedValueOnce({
userId: "user_refreshed",
email: "refreshed@example.com",
});
mockBunSpawn();

const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
access_token: "refreshed-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "refreshed-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "refreshed-token",
refreshToken: "refreshed-refresh-token",
expiresAt: 456,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
expect(mockStartAuthServer).toHaveBeenCalled();
expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
expect(mockStoreToken).toHaveBeenCalledWith({
accessToken: "refreshed-token",
refreshToken: "refreshed-refresh-token",
expiresAt: 456,
tokenType: "Bearer",
});
});

test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
});

test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
mockGetAuth.mockResolvedValue(undefined);
mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
access_token: "brand-new-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "brand-new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "brand-new-token",
refreshToken: "brand-new-refresh-token",
expiresAt: 789,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

test("in agent mode, returns early without prompting when already authenticated", async () => {
mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
mockGetAuth.mockResolvedValue({ userId: "user_123" });
mockFetchUserInfo.mockResolvedValue({
userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
mockGetAuth.mockResolvedValue({ userId: "user_123" });
mockFetchUserInfo
.mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
access_token: "new-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-token",
refreshToken: "new-refresh-token",
expiresAt: 999,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

test("in human mode, throws UserAbortError when user declines re-auth", async () => {
mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
mockGetAuth.mockResolvedValue({ userId: "user_123" });
mockFetchUserInfo.mockResolvedValue({
userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
});

test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
});

test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
});

test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
});

test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
});

test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
});

test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
mockGetAuth.mockResolvedValue({ userId: "user_123" });
mockFetchUserInfo.mockResolvedValue({
userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
});

test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
mockBunSpawn();

const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
access_token: "new-access-token",
token_type: "Bearer",
expires_in: 3600,
refresh_token: "new-refresh-token",
});
mockCreateOAuthSession.mockReturnValue({
accessToken: "new-access-token",
refreshToken: "new-refresh-token",
expiresAt: 123,
tokenType: "Bearer",
});
mockStoreToken.mockResolvedValue(undefined);
mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(auth): add OAuth refresh token session handling#205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wyattjoh
merged 9 commits into

from

Apr 22, 2026
 Merged


feat(auth): add OAuth refresh token session handling
#205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7b2350a

feat(auth): add OAuth refresh token session handling


wyattjoh Apr 21, 2026
3a9de4b

fix(doctor): validate refreshed oauth sessions


wyattjoh Apr 22, 2026
96b5b30

fix(auth): centralize auth error handling


wyattjoh Apr 22, 2026
9f939c0

docs(changeset): refresh expired OAuth sessions automatically for aut…


wyattjoh Apr 22, 2026
75b394a

test(auth): fix refreshed session test coverage


wyattjoh Apr 22, 2026
aa25592

fix(init): use hasStoredCredentials in isAuthenticated


wyattjoh Apr 22, 2026
026c76c

fix(auth): use stored session expiry metadata


wyattjoh Apr 22, 2026
e4daff6

fix(auth): require refresh tokens in stored sessions


wyattjoh Apr 22, 2026
9991c0c

fix(auth): log OAuth session refreshes


wyattjoh Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/oauth-refresh-token-support.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": minor
---

Refresh expired OAuth sessions automatically for authenticated CLI commands.

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/api/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ let mockStoredToken: string | null = null;
mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
 getToken: async () => mockStoredToken,
 getValidToken: async () => mockStoredToken,
}));
mock.module("../../lib/git.ts", () => gitStubs);

Expand Down

142 changes: 119 additions & 23 deletions
packages/cli-core/src/commands/auth/login.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { test, expect, describe, beforeEach, afterEach, mock, spyOn } from "bun:test";
import { AuthError } from "../../lib/errors.ts";
import { captureLog, credentialStoreStubs, configStubs } from "../../test/lib/stubs.ts";

const mockGetToken = mock();
const actualConstants = await import("../../lib/constants.ts");
const actualEnvironment = await import("../../lib/environment.ts");

const mockGetValidToken = mock();
const mockStoreToken = mock();
const mockCreateOAuthSession = mock();
const mockGetAuth = mock();
const mockSetAuth = mock();
const mockResolveProfile = mock();
Expand All@@ -16,8 +21,9 @@ const mockEnsureFirstApplication = mock<() => Promise<void>>(() => Promise.resol

mock.module("../../lib/credential-store.ts", () => ({
 ...credentialStoreStubs,
getToken: (...args: unknown[]) => mockGetToken(...args),
getValidToken: (...args: unknown[]) => mockGetValidToken(...args),
 storeToken: (...args: unknown[]) => mockStoreToken(...args),
 createOAuthSession: (...args: unknown[]) => mockCreateOAuthSession(...args),
}));

mock.module("../../lib/config.ts", () => ({
Expand All@@ -33,6 +39,7 @@ mock.module("../../lib/token-exchange.ts", () => ({
}));

mock.module("../../lib/environment.ts", () => ({
 ...actualEnvironment,
 getOAuthConfig: () => ({
 clientId: "test-client-id",
 scopes: "profile email",
Expand All@@ -43,6 +50,7 @@ mock.module("../../lib/environment.ts", () => ({
}));

mock.module("../../lib/constants.ts", () => ({
 ...actualConstants,
 CALLBACK_PATH: "/callback",
 AUTH_TIMEOUT_MS: 120000,
 CLERK_CLIENT_CLI: "cli",
Expand DownExpand Up@@ -95,8 +103,9 @@ describe("login", () => {

 afterEach(() => {
 captured.teardown();
mockGetToken.mockReset();
mockGetValidToken.mockReset();
 mockStoreToken.mockReset();
 mockCreateOAuthSession.mockReset();
 mockGetAuth.mockReset();
 mockSetAuth.mockReset();
 mockResolveProfile.mockReset();
Expand DownExpand Up@@ -132,7 +141,7 @@ describe("login", () => {
 }

 test("returns early when already authenticated with valid token", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -148,7 +157,7 @@ describe("login", () => {
 });

 test("performs fresh login when no token exists", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -162,6 +171,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -180,17 +196,29 @@ describe("login", () => {
 codeVerifier: "test-code-verifier",
 redirectUri: "http://127.0.0.1:54321/callback",
 });
 expect(mockStoreToken).toHaveBeenCalledWith("new-access-token");
 expect(mockCreateOAuthSession).toHaveBeenCalledWith({
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 expect(mockSetAuth).toHaveBeenCalledWith({ userId: "user_new" });
 expect(captured.err).toContain("Logged in as new@example.com");
 });

 test("re-authenticates when existing token is expired", async () => {
mockGetToken.mockResolvedValue("expired-token");
mockGetValidToken.mockRejectedValue(new AuthError({ reason: "session_expired" }));
 mockGetAuth.mockResolvedValue({ userId: "user_old" });
 mockFetchUserInfo
 .mockRejectedValueOnce(new Error("Token expired"))
 .mockResolvedValueOnce({ userId: "user_refreshed", email: "refreshed@example.com" });
 mockFetchUserInfo.mockResolvedValueOnce({
 userId: "user_refreshed",
 email: "refreshed@example.com",
 });
 mockBunSpawn();

 const mockServer = {
Expand All@@ -204,6 +232,13 @@ describe("login", () => {
 access_token: "refreshed-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "refreshed-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -213,11 +248,16 @@ describe("login", () => {

 expect(result).toEqual({ userId: "user_refreshed", email: "refreshed@example.com" });
 expect(mockStartAuthServer).toHaveBeenCalled();
 expect(mockStoreToken).toHaveBeenCalledWith("refreshed-token");
 expect(mockStoreToken).toHaveBeenCalledWith({
 accessToken: "refreshed-token",
 refreshToken: "refreshed-refresh-token",
 expiresAt: 456,
 tokenType: "Bearer",
 });
 });

 test("stops auth server and throws when callback fails", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -236,7 +276,7 @@ describe("login", () => {
 });

 test("proceeds with login when token exists but no auth config", async () => {
mockGetToken.mockResolvedValue("orphan-token");
mockGetValidToken.mockResolvedValue("orphan-token");
 mockGetAuth.mockResolvedValue(undefined);
 mockBunSpawn();

Expand All@@ -251,6 +291,13 @@ describe("login", () => {
 access_token: "brand-new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "brand-new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "brand-new-token",
 refreshToken: "brand-new-refresh-token",
 expiresAt: 789,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -268,7 +315,7 @@ describe("login", () => {

 test("in agent mode, returns early without prompting when already authenticated", async () => {
 mockIsHuman.mockReturnValue(false);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -286,7 +333,7 @@ describe("login", () => {

 test("in human mode, prompts and runs OAuth when user accepts re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo
 .mockResolvedValueOnce({ userId: "user_123", email: "old@example.com" })
Expand All@@ -305,6 +352,13 @@ describe("login", () => {
 access_token: "new-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-token",
 refreshToken: "new-refresh-token",
 expiresAt: 999,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockSetAuth.mockResolvedValue(undefined);
Expand All@@ -322,7 +376,7 @@ describe("login", () => {

 test("in human mode, throws UserAbortError when user declines re-auth", async () => {
 mockIsHuman.mockReturnValue(true);
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -338,7 +392,7 @@ describe("login", () => {
 });

 test("shows linked app with name and id in next steps when linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -352,6 +406,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -377,7 +438,7 @@ describe("login", () => {
 });

 test("shows linked app with only id when appName is missing", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -391,6 +452,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -415,7 +483,7 @@ describe("login", () => {
 });

 test("shows default next steps when not linked", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -429,6 +497,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -445,7 +520,7 @@ describe("login", () => {
 });

 test("authorize URL includes clerk_client=cli so dashboard recognizes CLI sign-up", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -459,6 +534,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -477,7 +559,7 @@ describe("login", () => {
 });

 test("calls ensureFirstApplication after a successful OAuth flow", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -491,6 +573,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand All@@ -506,7 +595,7 @@ describe("login", () => {
 });

 test("does not call ensureFirstApplication when existing session is reused", async () => {
mockGetToken.mockResolvedValue("existing-token");
mockGetValidToken.mockResolvedValue("existing-token");
 mockGetAuth.mockResolvedValue({ userId: "user_123" });
 mockFetchUserInfo.mockResolvedValue({
 userId: "user_123",
Expand All@@ -520,7 +609,7 @@ describe("login", () => {
 });

 test("suppresses auth next-steps when requested", async () => {
mockGetToken.mockResolvedValue(null);
mockGetValidToken.mockResolvedValue(null);
 mockBunSpawn();

 const mockServer = {
Expand All@@ -534,6 +623,13 @@ describe("login", () => {
 access_token: "new-access-token",
 token_type: "Bearer",
 expires_in: 3600,
 refresh_token: "new-refresh-token",
 });
 mockCreateOAuthSession.mockReturnValue({
 accessToken: "new-access-token",
 refreshToken: "new-refresh-token",
 expiresAt: 123,
 tokenType: "Bearer",
 });
 mockStoreToken.mockResolvedValue(undefined);
 mockFetchUserInfo.mockResolvedValue({
Expand Down
Loading
Loading