fix(codex): durable OAuth refresh lifecycle

Add shared OAuth credential lifecycle manager with provider-aware refresh
decisions. Implement CodexExecutor.refreshCredentials so 401/403 retry
refresh works for Codex, track lastRefreshAt and refresh before the
upstream stale-token window, preserve omitted idToken, and add
per-connection single-flight refresh to avoid refresh-token rotation races.

Merged from PR #1664.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Kevin Le
2026-06-06 11:04:36 +07:00
committed by decolua
co-authored by Cursor
parent 38b73bfc6b
commit c233c7c8fc
15 changed files with 484 additions and 140 deletions
+99 -10
View File
@@ -14,21 +14,30 @@ const originalFetch = global.fetch;
describe("Codex Refresh Token", () => {
beforeEach(() => {
vi.clearAllMocks();
vi.resetModules();
global.fetch = originalFetch;
});
afterEach(() => {
global.fetch = originalFetch;
});
function mockFetchWithJson(payload) {
const fetchMock = vi.fn().mockResolvedValue({
ok: true,
json: () => Promise.resolve(payload),
});
global.fetch = fetchMock;
return fetchMock;
}
describe("refreshCodexToken", () => {
it("should return new refresh_token when server provides one (token rotation)", async () => {
global.fetch = vi.fn().mockResolvedValue({
ok: true,
json: () => Promise.resolve({
const fetchMock = mockFetchWithJson({
access_token: "new-access",
refresh_token: "rotated-refresh-token",
id_token: "new-id-token",
expires_in: 3600,
}),
});
const { refreshCodexToken } = await import("../../open-sse/services/tokenRefresh.js");
@@ -36,21 +45,101 @@ describe("Codex Refresh Token", () => {
expect(result.refreshToken).toBe("rotated-refresh-token");
expect(result.accessToken).toBe("new-access");
expect(result.idToken).toBe("new-id-token");
expect(fetchMock).toHaveBeenCalledWith(
"https://auth.openai.com/oauth/token",
expect.objectContaining({
method: "POST",
headers: expect.objectContaining({
"Content-Type": "application/json",
Accept: "application/json",
}),
body: JSON.stringify({
client_id: "app_EMoamEEZ73f0CkXaXp7hrann",
grant_type: "refresh_token",
refresh_token: "old-refresh-token",
}),
})
);
});
it("should keep old refresh_token when server does not return new one", async () => {
global.fetch = vi.fn().mockResolvedValue({
ok: true,
json: () => Promise.resolve({
mockFetchWithJson({
access_token: "new-access",
expires_in: 3600,
}),
});
const { refreshCodexToken } = await import("../../open-sse/services/tokenRefresh.js");
const result = await refreshCodexToken("old-refresh-token", null);
const result = await refreshCodexToken("old-refresh-token-without-rotation", null);
expect(result.refreshToken).toBe("old-refresh-token");
expect(result.refreshToken).toBe("old-refresh-token-without-rotation");
});
});
describe("CodexExecutor credential lifecycle", () => {
it("should refresh Codex credentials and preserve omitted id_token", async () => {
mockFetchWithJson({
access_token: "new-access",
refresh_token: "rotated-refresh-token",
expires_in: 3600,
});
const { CodexExecutor } = await import("../../open-sse/executors/codex.js");
const executor = new CodexExecutor();
const result = await executor.refreshCredentials({
connectionId: "codex-1",
refreshToken: "old-refresh-token",
idToken: "old-id-token",
}, null);
expect(result.accessToken).toBe("new-access");
expect(result.refreshToken).toBe("rotated-refresh-token");
expect(result.idToken).toBe("old-id-token");
expect(result.lastRefreshAt).toBeTruthy();
expect(result.expiresAt).toBeTruthy();
});
it("should refresh Codex when lastRefreshAt is older than the upstream stale window", async () => {
const { CodexExecutor } = await import("../../open-sse/executors/codex.js");
const executor = new CodexExecutor();
const farFuture = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString();
const staleRefresh = new Date(Date.now() - 9 * 24 * 60 * 60 * 1000).toISOString();
const recentRefresh = new Date(Date.now() - 1 * 24 * 60 * 60 * 1000).toISOString();
expect(executor.needsRefresh({
refreshToken: "refresh-token",
expiresAt: farFuture,
lastRefreshAt: staleRefresh,
})).toBe(true);
expect(executor.needsRefresh({
refreshToken: "refresh-token",
expiresAt: farFuture,
lastRefreshAt: recentRefresh,
})).toBe(false);
});
it("should de-duplicate concurrent refreshes for the same Codex connection", async () => {
const fetchMock = mockFetchWithJson({
access_token: "new-access",
refresh_token: "rotated-refresh-token",
expires_in: 3600,
});
const { refreshProviderCredentials } = await import("../../open-sse/services/oauthCredentialManager.js");
const credentials = {
connectionId: "codex-single-flight",
refreshToken: "old-refresh-token",
};
const [first, second] = await Promise.all([
refreshProviderCredentials("codex", credentials, null),
refreshProviderCredentials("codex", credentials, null),
]);
expect(first.accessToken).toBe("new-access");
expect(second.accessToken).toBe("new-access");
expect(fetchMock).toHaveBeenCalledTimes(1);
});
});