Skip to content

fix(typecheck): type cache-busted credential tests #1525

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
kevincodex1 merged 1 commit into from
Jun 9, 2026
Merged

fix(typecheck): type cache-busted credential tests #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 24 additions & 27 deletions src/services/api/providerConfig.codexSecureStorage.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ import * as realOs from 'node:os'
import * as realCodexCredentials from '../../utils/codexCredentials.js'
import { acquireEnvMutex, releaseEnvMutex } from '../../entrypoints/sdk/shared.js'

type ProviderConfigModule = typeof import('./providerConfig.js')

function importFreshProviderConfig(
cacheKey: string,
): Promise<ProviderConfigModule> {
return import(
`./providerConfig.js?${cacheKey}`
) as Promise<ProviderConfigModule>
}

function makeJwt(payload: Record<string, unknown>): string {
const header = Buffer.from(JSON.stringify({ alg: 'none', typ: 'JWT' }))
.toString('base64url')
Expand Down Expand Up @@ -35,10 +45,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-secure-storage'
)
const { resolveCodexApiCredentials } =
await importFreshProviderConfig('codex-secure-storage')

const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
expect(credentials.apiKey).toBe('codex-api-key-token')
Expand All @@ -57,10 +65,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-env-precedence'
)
const { resolveCodexApiCredentials } =
await importFreshProviderConfig('codex-env-precedence')

const credentials = resolveCodexApiCredentials({
CODEX_API_KEY: 'env-token',
Expand All @@ -80,10 +86,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
readCodexCredentials: () => undefined,
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-env-nested-account'
)
const { resolveCodexApiCredentials } =
await importFreshProviderConfig('codex-env-nested-account')

const credentials = resolveCodexApiCredentials({
CODEX_API_KEY: makeJwt({
Expand Down Expand Up @@ -121,10 +125,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
)

try {
// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-auth-json-nested-account'
)
const { resolveCodexApiCredentials } =
await importFreshProviderConfig('codex-auth-json-nested-account')

const credentials = resolveCodexApiCredentials({
CODEX_AUTH_JSON_PATH: authPath,
Expand All @@ -149,10 +151,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-secure-storage-no-auth-io'
)
const { resolveCodexApiCredentials } =
await importFreshProviderConfig('codex-secure-storage-no-auth-io')

const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
expect(credentials.apiKey).toBe('codex-api-key-token')
Expand Down Expand Up @@ -189,10 +189,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-refresh-cooldown-fallback'
)
const { resolveCodexApiCredentials } =
await importFreshProviderConfig('codex-refresh-cooldown-fallback')

try {
const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
Expand Down Expand Up @@ -229,9 +227,8 @@ describe('resolveCodexApiCredentials with secure storage', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveCodexApiCredentials } = await import(
'./providerConfig.js?codex-refresh-cooldown-account-id-fallback'
const { resolveCodexApiCredentials } = await importFreshProviderConfig(
'codex-refresh-cooldown-account-id-fallback',
)

try {
Expand Down
15 changes: 12 additions & 3 deletions src/services/api/providerConfig.runtimeCodexCredentials.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ import {
releaseSharedMutationLock,
} from '../../test/sharedMutationLock.js'

type ProviderConfigModule = typeof import('./providerConfig.js')

function importFreshProviderConfig(
cacheKey: string,
): Promise<ProviderConfigModule> {
return import(
`./providerConfig.js?${cacheKey}`
) as Promise<ProviderConfigModule>
}

beforeEach(async () => {
await acquireSharedMutationLock('services/api/providerConfig.runtimeCodexCredentials.test.ts')
})
Expand Down Expand Up @@ -99,9 +109,8 @@ test('runtime credential resolution avoids sync secure-storage reads when async
},
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { resolveRuntimeCodexCredentials } = await import(
'./providerConfig.js?runtime-no-sync-secure-storage'
const { resolveRuntimeCodexCredentials } = await importFreshProviderConfig(
'runtime-no-sync-secure-storage',
)

const credentials = resolveRuntimeCodexCredentials({
Expand Down
95 changes: 40 additions & 55 deletions src/utils/codexCredentials.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ import {
releaseSharedMutationLock,
} from '../test/sharedMutationLock.js'

type CodexCredentialsModule = typeof import('./codexCredentials.js')

function importFreshCodexCredentials(
cacheKey: string,
): Promise<CodexCredentialsModule> {
return import(
`./codexCredentials.js?${cacheKey}`
) as Promise<CodexCredentialsModule>
}

function makeJwt(payload: Record<string, unknown>): string {
const header = Buffer.from(JSON.stringify({ alg: 'none', typ: 'JWT' }))
.toString('base64url')
Expand Down Expand Up @@ -85,10 +95,8 @@ describe('codexCredentials', () => {
test('save returns failure in bare mode', async () => {
process.env.CLAUDE_CODE_SIMPLE = '1'

// @ts-expect-error cache-busting query string for Bun module mocks
const { saveCodexCredentials } = await import(
'./codexCredentials.js?save-bare-mode'
)
const { saveCodexCredentials } =
await importFreshCodexCredentials('save-bare-mode')

const result = saveCodexCredentials({
accessToken: 'token',
Expand Down Expand Up @@ -123,10 +131,8 @@ describe('codexCredentials', () => {
getSecureStorage,
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { readCodexCredentials, saveCodexCredentials } = await import(
'./codexCredentials.js?save-plaintext-fallback'
)
const { readCodexCredentials, saveCodexCredentials } =
await importFreshCodexCredentials('save-plaintext-fallback')

const result = saveCodexCredentials({
accessToken: 'fallback-access-token',
Expand Down Expand Up @@ -189,10 +195,8 @@ describe('codexCredentials', () => {
},
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { saveCodexCredentials } = await import(
'./codexCredentials.js?save-scoped-plaintext-fallback'
)
const { saveCodexCredentials } =
await importFreshCodexCredentials('save-scoped-plaintext-fallback')

const result = saveCodexCredentials({
accessToken: 'codex-access-token',
Expand Down Expand Up @@ -249,9 +253,8 @@ describe('codexCredentials', () => {
},
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { saveCodexCredentials } = await import(
'./codexCredentials.js?save-fail-closed-shadowed-fallback'
const { saveCodexCredentials } = await importFreshCodexCredentials(
'save-fail-closed-shadowed-fallback',
)

const result = saveCodexCredentials({
Expand Down Expand Up @@ -293,10 +296,8 @@ describe('codexCredentials', () => {
},
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { readCodexCredentials, saveCodexCredentials } = await import(
'./codexCredentials.js?save-fail-closed-stale-native-delete'
)
const { readCodexCredentials, saveCodexCredentials } =
await importFreshCodexCredentials('save-fail-closed-stale-native-delete')

const result = saveCodexCredentials({
accessToken: 'codex-access-token',
Expand Down Expand Up @@ -347,10 +348,10 @@ describe('codexCredentials', () => {
},
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { readCodexCredentials, saveCodexCredentials } = await import(
'./codexCredentials.js?save-native-success-plaintext-cleanup-fails'
)
const { readCodexCredentials, saveCodexCredentials } =
await importFreshCodexCredentials(
'save-native-success-plaintext-cleanup-fails',
)

const result = saveCodexCredentials({
accessToken: 'native-codex-access-token',
Expand Down Expand Up @@ -384,10 +385,8 @@ describe('codexCredentials', () => {
getSecureStorage,
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { saveCodexCredentials } = await import(
'./codexCredentials.js?save-incomplete'
)
const { saveCodexCredentials } =
await importFreshCodexCredentials('save-incomplete')

const result = saveCodexCredentials({
accessToken: '',
Expand Down Expand Up @@ -480,9 +479,8 @@ describe('codexCredentials', () => {
},
) as unknown as typeof fetch

// @ts-expect-error cache-busting query string for Bun module mocks
const { refreshCodexAccessTokenIfNeeded, readCodexCredentials } =
await import('./codexCredentials.js?refresh-success')
await importFreshCodexCredentials('refresh-success')

const result = await refreshCodexAccessTokenIfNeeded()
expect(result.refreshed).toBe(true)
Expand Down Expand Up @@ -541,9 +539,8 @@ describe('codexCredentials', () => {
)
}) as unknown as typeof fetch

// @ts-expect-error cache-busting query string for Bun module mocks
const { refreshCodexAccessTokenIfNeeded, readCodexCredentials } =
await import('./codexCredentials.js?refresh-cooldown')
await importFreshCodexCredentials('refresh-cooldown')

await expect(refreshCodexAccessTokenIfNeeded()).rejects.toThrow(
'Codex token refresh failed (invalid_grant): refresh token expired',
Expand Down Expand Up @@ -628,9 +625,8 @@ describe('codexCredentials', () => {
},
) as unknown as typeof fetch

// @ts-expect-error cache-busting query string for Bun module mocks
const { refreshCodexAccessTokenIfNeeded, readCodexCredentials } =
await import('./codexCredentials.js?refresh-drop-stale-api-key')
await importFreshCodexCredentials('refresh-drop-stale-api-key')

const result = await refreshCodexAccessTokenIfNeeded()
expect(result.refreshed).toBe(true)
Expand Down Expand Up @@ -725,10 +721,8 @@ describe('codexCredentials', () => {
)
}) as unknown as typeof fetch

// @ts-expect-error cache-busting query string for Bun module mocks
const { refreshCodexAccessTokenIfNeeded } = await import(
'./codexCredentials.js?refresh-dedupe'
)
const { refreshCodexAccessTokenIfNeeded } =
await importFreshCodexCredentials('refresh-dedupe')

const firstRefresh = refreshCodexAccessTokenIfNeeded()
const secondRefresh = refreshCodexAccessTokenIfNeeded()
Expand Down Expand Up @@ -768,10 +762,8 @@ describe('codexCredentials', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { readCodexCredentials, saveCodexCredentials } = await import(
'./codexCredentials.js?preserve-profile-id'
)
const { readCodexCredentials, saveCodexCredentials } =
await importFreshCodexCredentials('preserve-profile-id')

const saved = saveCodexCredentials({
accessToken: 'access-new',
Expand Down Expand Up @@ -805,11 +797,10 @@ describe('codexCredentials', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const {
attachCodexProfileIdToStoredCredentials,
readCodexCredentials,
} = await import('./codexCredentials.js?attach-profile-id')
} = await importFreshCodexCredentials('attach-profile-id')

const result =
attachCodexProfileIdToStoredCredentials('profile_codex_oauth')
Expand Down Expand Up @@ -852,10 +843,8 @@ describe('codexCredentials', () => {
},
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { clearCodexCredentials } = await import(
'./codexCredentials.js?clear-scoped-plaintext-fallback'
)
const { clearCodexCredentials } =
await importFreshCodexCredentials('clear-scoped-plaintext-fallback')

const result = clearCodexCredentials()

Expand Down Expand Up @@ -897,10 +886,8 @@ describe('codexCredentials', () => {
}),
}))

// @ts-expect-error cache-busting query string for Bun module mocks
const { refreshCodexAccessTokenIfNeeded } = await import(
'./codexCredentials.js?refresh-async-read'
)
const { refreshCodexAccessTokenIfNeeded } =
await importFreshCodexCredentials('refresh-async-read')

const result = await refreshCodexAccessTokenIfNeeded()
expect(result.refreshed).toBe(false)
Expand Down Expand Up @@ -955,10 +942,8 @@ describe('codexCredentials', () => {
)
}) as unknown as typeof fetch

// @ts-expect-error cache-busting query string for Bun module mocks
const { refreshCodexAccessTokenIfNeeded } = await import(
'./codexCredentials.js?refresh-memory-cooldown'
)
const { refreshCodexAccessTokenIfNeeded } =
await importFreshCodexCredentials('refresh-memory-cooldown')

await expect(refreshCodexAccessTokenIfNeeded()).rejects.toThrow(
'Codex token refresh failed (invalid_grant): refresh token expired',
Expand Down
Loading