@iam-brain/opencode-codex-auth 1.2.4 → 1.3.0

package/dist/lib/storage/migration.js

@@ -0,0 +1,225 @@
+import path from "node:path";
+import { normalizeAccountAuthTypes } from "../account-auth-types.js";
+import { buildIdentityKey, ensureIdentityKey } from "../identity.js";
+import { extractAccountIdFromClaims, extractEmailFromClaims, extractPlanFromClaims, parseJwtClaims } from "../claims.js";
+import { CODEX_ACCOUNTS_FILE, legacyOpenAICodexAccountsPathFor, opencodeProviderAuthLegacyFallbackPath, opencodeProviderAuthPath } from "../paths.js";
+import { isLegacyOauthAuth, isMultiOauthAuth, normalizeAccountRecord, normalizeOpenAIOAuthState, OPENAI_AUTH_MODES } from "./domain-state.js";
+export function listLegacyProviderAuthCandidates(env = process.env) {
+    const primary = opencodeProviderAuthPath(env);
+    const legacyFallback = opencodeProviderAuthLegacyFallbackPath(env);
+    if (primary === legacyFallback)
+        return [primary];
+    return [primary, legacyFallback];
+}
+export function listLegacyAuthCandidates(filePath) {
+    return [legacyOpenAICodexAccountsPathFor(filePath), ...listLegacyProviderAuthCandidates(process.env)];
+}
+export function sanitizeAuthFile(input, options) {
+    const openAIOnly = options?.openAIOnly !== false;
+    if (openAIOnly) {
+        if (input.openai) {
+            return { openai: input.openai };
+        }
+        return {};
+    }
+    if (input.openai) {
+        return { ...input, openai: input.openai };
+    }
+    return { ...input };
+}
+export function shouldEnforceOpenAIOnlyStorage(filePath) {
+    return path.basename(filePath) === CODEX_ACCOUNTS_FILE;
+}
+export function hasUsableOpenAIOAuth(auth) {
+    const openai = auth.openai;
+    if (!openai || openai.type !== "oauth")
+        return false;
+    if (isMultiOauthAuth(openai)) {
+        const normalized = normalizeOpenAIOAuthState(openai);
+        return OPENAI_AUTH_MODES.some((authMode) => {
+            const domain = normalized[authMode];
+            if (!domain)
+                return false;
+            return domain.accounts.some((account) => typeof account.refresh === "string" && account.refresh.trim().length > 0);
+        });
+    }
+    return isLegacyOauthAuth(openai) && openai.refresh.trim().length > 0;
+}
+export function migrateAuthFile(input) {
+    const auth = input ?? {};
+    const openai = auth.openai;
+    if (!openai || openai.type !== "oauth")
+        return auth;
+    if (isMultiOauthAuth(openai)) {
+        auth.openai = normalizeOpenAIOAuthState(openai);
+        return auth;
+    }
+    if (!isLegacyOauthAuth(openai))
+        return auth;
+    const claims = parseJwtClaims(openai.access);
+    const account = ensureIdentityKey({
+        access: openai.access,
+        refresh: openai.refresh,
+        expires: openai.expires,
+        accountId: openai.accountId || extractAccountIdFromClaims(claims),
+        email: openai.email || extractEmailFromClaims(claims),
+        plan: openai.plan || extractPlanFromClaims(claims),
+        authTypes: ["native"],
+        enabled: true
+    });
+    const migrated = {
+        type: "oauth",
+        accounts: [],
+        native: {
+            accounts: [account],
+            activeIdentityKey: account.identityKey
+        }
+    };
+    auth.openai = normalizeOpenAIOAuthState(migrated);
+    return auth;
+}
+export function migrateLegacyCodexAccounts(input) {
+    if (typeof input.openai === "object" && input.openai !== null && !Array.isArray(input.openai))
+        return undefined;
+    const rawAccounts = Array.isArray(input.accounts) ? input.accounts : undefined;
+    if (!rawAccounts || rawAccounts.length === 0)
+        return undefined;
+    const mappedAccounts = [];
+    for (const raw of rawAccounts) {
+        if (typeof raw !== "object" || raw === null || Array.isArray(raw))
+            continue;
+        const source = raw;
+        const refreshToken = typeof source.refreshToken === "string" ? source.refreshToken.trim() : "";
+        if (!refreshToken)
+            continue;
+        const accessToken = typeof source.accessToken === "string"
+            ? source.accessToken
+            : typeof source.access === "string"
+                ? source.access
+                : undefined;
+        const claims = accessToken ? parseJwtClaims(accessToken) : undefined;
+        const account = ensureIdentityKey({
+            refresh: refreshToken,
+            access: accessToken,
+            expires: typeof source.expiresAt === "number"
+                ? source.expiresAt
+                : typeof source.expires === "number"
+                    ? source.expires
+                    : 0,
+            accountId: typeof source.accountId === "string" ? source.accountId : extractAccountIdFromClaims(claims),
+            email: typeof source.email === "string" ? source.email : extractEmailFromClaims(claims),
+            plan: typeof source.plan === "string" ? source.plan : extractPlanFromClaims(claims),
+            authTypes: normalizeAccountAuthTypes(source.authTypes),
+            enabled: typeof source.enabled === "boolean" ? source.enabled : true
+        });
+        account.authTypes = normalizeAccountAuthTypes(account.authTypes);
+        if (typeof source.lastUsed === "number") {
+            account.lastUsed = source.lastUsed;
+        }
+        const cooldownUntil = typeof source.cooldownUntil === "number"
+            ? source.cooldownUntil
+            : typeof source.coolingDownUntil === "number"
+                ? source.coolingDownUntil
+                : undefined;
+        if (typeof cooldownUntil === "number") {
+            account.cooldownUntil = cooldownUntil;
+        }
+        mappedAccounts.push(account);
+    }
+    if (mappedAccounts.length === 0)
+        return undefined;
+    const activeIndex = typeof input.activeIndex === "number" ? Math.floor(input.activeIndex) : 0;
+    const safeActiveIndex = activeIndex >= 0 && activeIndex < mappedAccounts.length ? activeIndex : 0;
+    const activeIdentityKey = mappedAccounts[safeActiveIndex]?.identityKey;
+    const auth = {
+        openai: {
+            type: "oauth",
+            accounts: mappedAccounts,
+            ...(activeIdentityKey ? { activeIdentityKey } : {})
+        }
+    };
+    return migrateAuthFile(auth);
+}
+export function ensureMultiOauthState(auth) {
+    const openai = auth.openai;
+    if (!openai || openai.type !== "oauth") {
+        const created = {
+            type: "oauth",
+            accounts: [],
+            native: { accounts: [] }
+        };
+        auth.openai = normalizeOpenAIOAuthState(created);
+        return auth.openai;
+    }
+    if (!isMultiOauthAuth(openai)) {
+        const migrated = migrateAuthFile({ openai }).openai;
+        if (migrated && isMultiOauthAuth(migrated)) {
+            auth.openai = normalizeOpenAIOAuthState(migrated);
+            return auth.openai;
+        }
+        const created = {
+            type: "oauth",
+            accounts: [],
+            native: { accounts: [] }
+        };
+        auth.openai = normalizeOpenAIOAuthState(created);
+        return auth.openai;
+    }
+    auth.openai = normalizeOpenAIOAuthState(openai);
+    return auth.openai;
+}
+export function upsertDomainAccount(domain, input, authMode) {
+    const incoming = { ...input, authTypes: [authMode] };
+    normalizeAccountRecord(incoming, authMode);
+    const incomingIdentity = incoming.identityKey;
+    const incomingStrictIdentity = buildIdentityKey(incoming);
+    const incomingRefresh = typeof incoming.refresh === "string" ? incoming.refresh : "";
+    let strictMatchIndex = -1;
+    let refreshFallbackMatchIndex = -1;
+    let refreshFallbackAmbiguous = false;
+    domain.accounts.forEach((existing, index) => {
+        if (strictMatchIndex >= 0)
+            return;
+        normalizeAccountRecord(existing, authMode);
+        const existingStrictIdentity = buildIdentityKey(existing);
+        if (incomingIdentity && existing.identityKey === incomingIdentity) {
+            strictMatchIndex = index;
+            return;
+        }
+        if (incomingStrictIdentity && existingStrictIdentity && incomingStrictIdentity === existingStrictIdentity) {
+            strictMatchIndex = index;
+            return;
+        }
+        if (incomingRefresh &&
+            existing.refresh === incomingRefresh &&
+            (!incomingStrictIdentity || !existingStrictIdentity)) {
+            if (refreshFallbackMatchIndex >= 0 && refreshFallbackMatchIndex !== index) {
+                refreshFallbackAmbiguous = true;
+            }
+            else {
+                refreshFallbackMatchIndex = index;
+            }
+        }
+    });
+    const matchIndex = strictMatchIndex >= 0
+        ? strictMatchIndex
+        : !refreshFallbackAmbiguous && refreshFallbackMatchIndex >= 0
+            ? refreshFallbackMatchIndex
+            : -1;
+    if (matchIndex < 0) {
+        domain.accounts.push(incoming);
+        return true;
+    }
+    const existing = domain.accounts[matchIndex];
+    if (!existing)
+        return false;
+    const existingExpires = typeof existing.expires === "number" ? existing.expires : -Infinity;
+    const incomingExpires = typeof incoming.expires === "number" ? incoming.expires : -Infinity;
+    const preferIncoming = incomingExpires >= existingExpires;
+    domain.accounts[matchIndex] = preferIncoming
+        ? { ...existing, ...incoming, authTypes: [authMode] }
+        : { ...incoming, ...existing, authTypes: [authMode] };
+    normalizeAccountRecord(domain.accounts[matchIndex], authMode);
+    return false;
+}
+//# sourceMappingURL=migration.js.map

package/dist/lib/storage/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../lib/storage/migration.ts"],"names":[],"mappings":"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"}

package/dist/lib/storage.d.ts

@@ -1,4 +1,4 @@
-import type { AuthFile, OpenAIAuthMode, OpenAIOAuthDomain, OpenAIMultiOauthAuth } from "./types.js";
+import type { AuthFile, OpenAIAuthMode } from "./types.js";
 type AuthLoadOptions = {
     quarantineDir?: string;
     now?: () => number;
@@ -11,12 +11,6 @@ export type LegacyTransferResult = {
     sourcesUsed: number;
 };
 export declare function importLegacyInstallData(filePath?: string): Promise<LegacyTransferResult>;
-export declare function getOpenAIOAuthDomain(auth: AuthFile, authMode: OpenAIAuthMode): OpenAIOAuthDomain | undefined;
-export declare function ensureOpenAIOAuthDomain(auth: AuthFile, authMode: OpenAIAuthMode): OpenAIOAuthDomain;
-export declare function listOpenAIOAuthDomains(auth: AuthFile): Array<{
-    mode: OpenAIAuthMode;
-    domain: OpenAIOAuthDomain;
-}>;
 export declare function loadAuthStorage(filePath?: string, opts?: AuthLoadOptions): Promise<AuthFile>;
 export declare function saveAuthStorage(filePath: string | undefined, update: (auth: AuthFile) => void | AuthFile | Promise<void | AuthFile>): Promise<AuthFile>;
 export declare function setAccountCooldown(filePath: string | undefined, identityKey: string, cooldownUntil: number, authMode?: OpenAIAuthMode): Promise<AuthFile>;
@@ -25,6 +19,5 @@ export declare function updateAccountTokensByIdentityKey(filePath: string | unde
     refresh: string;
     expires: number;
 }, authMode?: OpenAIAuthMode): Promise<AuthFile>;
-export declare function requireOpenAIMultiOauthAuth(auth: AuthFile): OpenAIMultiOauthAuth;
-export {};
+export { ensureOpenAIOAuthDomain, getOpenAIOAuthDomain, listOpenAIOAuthDomains, requireOpenAIMultiOauthAuth } from "./storage/domain-state.js";
 //# sourceMappingURL=storage.d.ts.map

package/dist/lib/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAiB,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AA4BlH,KAAK,eAAe,GAAG;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAsXzG,wBAAsB,yBAAyB,CAAC,QAAQ,GAAE,MAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,CA4BtG;AA6DD,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAsB,uBAAuB,CAAC,QAAQ,GAAE,MAA0B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA4DjH;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,GAAG,iBAAiB,GAAG,SAAS,CAM5G;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,GAAG,iBAAiB,CAgBnG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAA;CAAE,CAAC,CAQjH;AAeD,wBAAsB,eAAe,CAAC,QAAQ,GAAE,MAA0B,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAcrH;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,YAAoB,EACpC,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,GACrE,OAAO,CAAC,QAAQ,CAAC,CAkBnB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,YAAoB,EACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,QAAQ,GAAE,cAAyB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAQnB;AAED,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,YAAoB,EACpC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAC3D,QAAQ,GAAE,cAAyB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAUnB;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,CAuChF"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAa1D,KAAK,eAAe,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAkDD,wBAAsB,yBAAyB,CAAC,QAAQ,GAAE,MAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BtG;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAsB,uBAAuB,CAAC,QAAQ,GAAE,MAA0B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA4DjH;AAeD,wBAAsB,eAAe,CAAC,QAAQ,GAAE,MAA0B,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAcrH;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,YAAoB,EACpC,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,GACrE,OAAO,CAAC,QAAQ,CAAC,CAkBnB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,YAAoB,EACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,QAAQ,GAAE,cAAyB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAQnB;AAED,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,YAAoB,EACpC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAC3D,QAAQ,GAAE,cAAyB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAUnB;AAED,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,2BAA2B,CAAA"}