Skip to content

Commit d092e91

Browse files
committed
test(oauth): prove Kiro replacement admission recovers
1 parent 108d8d0 commit d092e91

1 file changed

Lines changed: 31 additions & 5 deletions

File tree

‎tests/oauth-public-surface.test.ts‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -510,19 +510,45 @@ describe("legacy ChatGPT OAuth public-surface exclusion", () => {
510510
});
511511

512512
test("Kiro does not start a replacement until the canceled external CLI flow settles", async () => {
513+
saveConfig(config());
513514
const originalLogin = OAUTH_PROVIDERS.kiro.login;
515+
let loginCalls = 0;
514516
OAUTH_PROVIDERS.kiro.login = async (ctrl) => {
515-
ctrl.onAuth({ url: "", deviceCode: "kiro-cancel-flow" });
516-
await new Promise<never>((_, reject) => {
517-
ctrl.signal.addEventListener("abort", () => reject(new Error("Kiro login cancelled")), { once: true });
518-
});
517+
loginCalls += 1;
518+
const call = loginCalls;
519+
ctrl.onAuth({ url: "", deviceCode: `kiro-flow-${call}` });
520+
if (call === 1) {
521+
await new Promise<never>((_, reject) => {
522+
ctrl.signal.addEventListener("abort", () => reject(new Error("Kiro login cancelled")), { once: true });
523+
});
524+
}
525+
return {
526+
access: "kiro-replacement-access",
527+
refresh: "kiro-replacement-refresh",
528+
accountId: "kiro-replacement-account",
529+
530+
expires: Date.now() + 60_000,
531+
};
519532
};
520533

521534
try {
522535
await startLoginFlow("kiro");
523536
expect(cancelLoginFlow("kiro")).toBe(true);
524537
await expect(startLoginFlow("kiro")).rejects.toThrow("A login for kiro is already in progress");
525-
await Bun.sleep(0);
538+
539+
let replacement: Awaited<ReturnType<typeof startLoginFlow>> | undefined;
540+
for (let attempt = 0; attempt < 200; attempt += 1) {
541+
try {
542+
replacement = await startLoginFlow("kiro");
543+
break;
544+
} catch (error) {
545+
if (!(error instanceof Error) || !error.message.includes("already in progress")) throw error;
546+
await Bun.sleep(5);
547+
}
548+
}
549+
expect(replacement).toMatchObject({ deviceCode: "kiro-flow-2" });
550+
expect(await waitForOAuthDone("kiro")).toMatchObject({ done: true, loggedIn: true });
551+
expect(loginCalls).toBe(2);
526552
} finally {
527553
OAUTH_PROVIDERS.kiro.login = originalLogin;
528554
clearLoginState("kiro");

0 commit comments

Comments
 (0)