mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-18 21:02:50 +03:00
7cfabfc5c9
Validated in a combined 3-PR batch worktree off release/v3.8.51 tip (a sibling PR from the same author, #11495, was held out — a typecheck error in zai-web.ts only reproduced with this PR + #11495 boarded together, and cleared without #11495; isolated this PR alone confirmed clean on its own too, so the interaction belonged to #11495's side — see its comment). - Golden lock: executor-map-golden.test.ts — passes byte-identical (same keys, classes, provider identities, dispatch guards) - Focused tests part of batch's 94/94 node:test run - typecheck:core, file-size, changelog-integrity, complexity, cognitive-complexity — all OK - Full-repo lint: 228 pre-existing dashboard react-hooks/* findings, unrelated to this diff Thanks for the measured, careful methodology here — the golden-lock contract plus the isolated DATA_DIR benchmarking make this an easy PR to trust despite the wide surface (72 files).
86 lines
3.2 KiB
TypeScript
86 lines
3.2 KiB
TypeScript
/**
|
|
* Graceful-degradation fallback when `refreshCredentials` returns null but the
|
|
* connection still holds a usable `accessToken`.
|
|
*
|
|
* Previously this fallback was qualified to `connection.provider === "github"`:
|
|
* every OTHER OAuth provider whose refresh momentarily failed was hard-failed
|
|
* with "Failed to refresh credentials. Please re-authorize the connection.",
|
|
* even though a still-valid access token was on hand. The fix drops the
|
|
* github-specific qualifier so the fallback applies to ANY provider that still
|
|
* has an accessToken.
|
|
*
|
|
* Before the fix this test fails: a non-github provider would throw the 401
|
|
* re-authorize error. After the fix it returns `{ refreshed: false }`.
|
|
*/
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
process.env.DATA_DIR = fs.mkdtempSync(
|
|
path.join(os.tmpdir(), "omniroute-accesstoken-fallback-")
|
|
);
|
|
|
|
const { getExecutor } = await import("../../open-sse/executors/index.ts");
|
|
const { refreshAndUpdateCredentials } = await import("../../src/lib/usage/providerLimits.ts");
|
|
|
|
// `gemini` is a non-rotating (no rotation lock group), non-github OAuth provider,
|
|
// so `shouldAttemptRotatingRefresh` is true and the refresh path is reached.
|
|
function geminiConnection() {
|
|
return {
|
|
id: "gemini-fallback-1",
|
|
provider: "gemini",
|
|
accessToken: "still-valid-access-token",
|
|
refreshToken: "some-refresh-token",
|
|
tokenExpiresAt: new Date(Date.now() - 60_000).toISOString(), // expired → needsRefresh fires
|
|
providerSpecificData: {},
|
|
};
|
|
}
|
|
|
|
test("falls back to the existing accessToken for a non-github provider when refreshCredentials returns null", async () => {
|
|
const exec = await getExecutor("gemini");
|
|
const origNeeds = exec.needsRefresh;
|
|
const origRefresh = exec.refreshCredentials;
|
|
exec.needsRefresh = () => true; // force the refresh attempt
|
|
exec.refreshCredentials = async () => null; // upstream refresh failed
|
|
try {
|
|
const result = await refreshAndUpdateCredentials(geminiConnection(), {
|
|
allowRotatingRefresh: true,
|
|
});
|
|
assert.equal(
|
|
result.refreshed,
|
|
false,
|
|
"a non-github provider with an accessToken must fall back, not throw"
|
|
);
|
|
assert.equal(
|
|
result.connection.accessToken,
|
|
"still-valid-access-token",
|
|
"the existing access token must be preserved"
|
|
);
|
|
} finally {
|
|
exec.needsRefresh = origNeeds;
|
|
exec.refreshCredentials = origRefresh;
|
|
}
|
|
});
|
|
|
|
test("still throws when refresh fails AND there is no accessToken to fall back on", async () => {
|
|
const exec = await getExecutor("gemini");
|
|
const origNeeds = exec.needsRefresh;
|
|
const origRefresh = exec.refreshCredentials;
|
|
exec.needsRefresh = () => true;
|
|
exec.refreshCredentials = async () => null;
|
|
try {
|
|
const conn = geminiConnection();
|
|
conn.accessToken = ""; // no usable token → must not silently degrade
|
|
await assert.rejects(
|
|
() => refreshAndUpdateCredentials(conn, { allowRotatingRefresh: true }),
|
|
/Failed to refresh credentials/,
|
|
"without an accessToken the refresh failure must surface as an error"
|
|
);
|
|
} finally {
|
|
exec.needsRefresh = origNeeds;
|
|
exec.refreshCredentials = origRefresh;
|
|
}
|
|
});
|