root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-4784): complete Step 1 — prefer Fusion Codex OAuth

Browse Source 
Fusion-Task-Id: FN-4784
Fusion-Task-Lineage: e11a4758-93ab-451e-8721-ae8995aaa70d
This commit is contained in:
Fusion (runfusion.ai)
2026-05-16 13:08:41 -07:00
committed by gsxdsm
parent 424c61f4f7
commit fd01843d40
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/dashboard/src/usage.ts
View File

@@ -1122,6 +1122,27 @@ type CodexCredential = {
}; };
async function loadCodexCredential(): Promise<CodexCredential | null> { async function loadCodexCredential(): Promise<CodexCredential | null> {
// Prefer Fusion-stored openai-codex OAuth credentials; fall back to Codex CLI auth.json.
let preferredCredential: ReturnType<typeof choosePreferredStoredCredential>;
for (const candidatePath of getAuthFileCandidates()) {
const authEntries = readStoredCredentialsFromAuthFile(candidatePath);
preferredCredential = choosePreferredStoredCredential(preferredCredential, authEntries["openai-codex"]);
}
if (
preferredCredential?.type === "oauth"
&& typeof preferredCredential.access === "string"
&& preferredCredential.access.length > 0
&& typeof preferredCredential.expires === "number"
&& Number.isFinite(preferredCredential.expires)
&& preferredCredential.expires > Date.now()
) {
return {
accessToken: preferredCredential.access,
source: "fusion-auth",
};
}
const codexHome = process.env.CODEX_HOME || path.join(getHomeDir(), ".codex"); const codexHome = process.env.CODEX_HOME || path.join(getHomeDir(), ".codex");
const authPath = path.join(codexHome, "auth.json"); const authPath = path.join(codexHome, "auth.json");
@@ -1142,27 +1163,7 @@ async function loadCodexCredential(): Promise<CodexCredential | null> {
}; };
} }
let preferredCredential: ReturnType<typeof choosePreferredStoredCredential>; return null;
for (const candidatePath of getAuthFileCandidates()) {
const authEntries = readStoredCredentialsFromAuthFile(candidatePath);
preferredCredential = choosePreferredStoredCredential(preferredCredential, authEntries["openai-codex"]);
}
if (
preferredCredential?.type !== "oauth"
|| typeof preferredCredential.access !== "string"
|| preferredCredential.access.length === 0
|| typeof preferredCredential.expires !== "number"
|| !Number.isFinite(preferredCredential.expires)
|| preferredCredential.expires <= Date.now()
) {
return null;
}
return {
accessToken: preferredCredential.access,
source: "fusion-auth",
};
} }
async function fetchCodexUsage(): Promise<ProviderUsage> { async function fetchCodexUsage(): Promise<ProviderUsage> {