mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-07 01:00:44 +00:00
* Harden OAuth refresh and Codex CLI bootstrap flows - Treat near-expiry OAuth credentials as unusable for bootstrap and refresh - Add clearer timeout and callback validation handling for OpenAI Codex OAuth - Tighten file lock retry behavior for stale OAuth refresh contention * fix(auth): address PR review threads * fix(auth): adopt fresher imported refresh tokens * test(auth): align oauth expiry fixtures with refresh margin * fix(auth): tighten Codex OAuth bootstrap and local fallback * Keep explicit local auth over CLI bootstrap - Preserve existing non-OAuth local profiles during external CLI OAuth sync - Add regression coverage for OpenAI Codex and generic external OAuth overlays * fix(auth): distinguish oauth lock timeout sources * fix(auth): reject cross-account external oauth bootstrap * fix(auth): narrow refresh contention classification
59 lines
1.6 KiB
TypeScript
59 lines
1.6 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
import {
|
|
acquireFileLock,
|
|
drainFileLockStateForTest,
|
|
FILE_LOCK_TIMEOUT_ERROR_CODE,
|
|
resetFileLockStateForTest,
|
|
} from "./file-lock.js";
|
|
|
|
describe("acquireFileLock", () => {
|
|
let tempDir = "";
|
|
|
|
beforeEach(async () => {
|
|
resetFileLockStateForTest();
|
|
tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-file-lock-"));
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await drainFileLockStateForTest();
|
|
if (tempDir) {
|
|
await fs.rm(tempDir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
it("respects the configured retry budget even when stale windows are much larger", async () => {
|
|
const filePath = path.join(tempDir, "oauth-refresh");
|
|
const lockPath = `${filePath}.lock`;
|
|
const options = {
|
|
retries: {
|
|
retries: 1,
|
|
factor: 1,
|
|
minTimeout: 20,
|
|
maxTimeout: 20,
|
|
},
|
|
stale: 100,
|
|
} as const;
|
|
|
|
await fs.writeFile(
|
|
lockPath,
|
|
JSON.stringify({ pid: process.pid, createdAt: new Date().toISOString() }, null, 2),
|
|
"utf8",
|
|
);
|
|
setTimeout(() => {
|
|
void fs.rm(lockPath, { force: true });
|
|
}, 50);
|
|
|
|
await expect(acquireFileLock(filePath, options)).rejects.toSatisfy((error) => {
|
|
expect(error).toMatchObject({
|
|
code: FILE_LOCK_TIMEOUT_ERROR_CODE,
|
|
});
|
|
expect((error as { lockPath?: string }).lockPath).toBeTruthy();
|
|
expect((error as { lockPath?: string }).lockPath).toMatch(/oauth-refresh\.lock$/);
|
|
return true;
|
|
});
|
|
}, 5_000);
|
|
});
|