Skip to content

Commit 491cb4f

Browse files
fix(web): preserve clock preference behavior across main integration
2 parents 092c44d + 3896914 commit 491cb4f

210 files changed

Lines changed: 14118 additions & 990 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.coderabbit.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
reviews:
2+
high_level_summary: false
23
review_status: false
34
auto_review:
45
enabled: true

‎apps/desktop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@t3tools/desktop",
3-
"version": "0.0.42",
3+
"version": "0.0.44",
44
"private": true,
55
"type": "module",
66
"main": "dist-electron/boot.cjs",
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
// @effect-diagnostics nodeBuiltinImport:off globalFetch:off - Tests exercise the real native loopback listener without an OpenAI account.
2+
import * as NodeHttp from "node:http";
3+
import { describe, expect, it } from "vite-plus/test";
4+
import { codexAuthDeliveryUrl, readCodexAuthDelivery } from "@t3tools/shared/codexAuthHandoff";
5+
import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
6+
import { receiveCodexAuthCallback, cancelCodexAuthCallback } from "./CodexAuthCallback.ts";
7+
8+
async function freePort() {
9+
const server = NodeHttp.createServer();
10+
await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
11+
const address = server.address();
12+
if (!address || typeof address === "string") throw new Error("address");
13+
await new Promise<void>((resolve) => server.close(() => resolve()));
14+
return address.port;
15+
}
16+
function request(port: number, state = "a".repeat(43)) {
17+
const url = new URL("https://auth.openai.com/api/accounts/authorize");
18+
url.search = new URLSearchParams({
19+
client_id: "dynamic_agent_client",
20+
response_type: "code",
21+
redirect_uri: `http://127.0.0.1:${port}/auth/callback`,
22+
state,
23+
code_challenge_method: "S256",
24+
code_challenge: "b".repeat(43),
25+
}).toString();
26+
return url.toString();
27+
}
28+
function callback(authorizationUrl: string) {
29+
const request = new URL(authorizationUrl);
30+
const url = new URL(request.searchParams.get("redirect_uri")!);
31+
url.search = new URLSearchParams({
32+
state: request.searchParams.get("state")!,
33+
code: "test-code",
34+
client_id: "oaiapp_test",
35+
}).toString();
36+
return url.toString();
37+
}
38+
39+
describe("desktop Codex callback helper", () => {
40+
it("binds before opening sign-in, ignores a foreign response, and returns only the code callback", async () => {
41+
const authorizationUrl = request(await freePort());
42+
const expected = callback(authorizationUrl);
43+
const received = await receiveCodexAuthCallback(authorizationUrl, async () => {
44+
const invalid = new URL(expected);
45+
invalid.searchParams.set("state", "foreign");
46+
expect((await fetch(invalid)).status).toBe(400);
47+
const response = await fetch(expected);
48+
expect(response.headers.get("cache-control")).toBe("no-store");
49+
expect(await response.text()).not.toContain("test-code");
50+
return true;
51+
});
52+
expect(received).toBe(expected);
53+
});
54+
it("returns hosted web to the exact instance and environment without putting the code in its query", async () => {
55+
const authorizationUrl = request(await freePort());
56+
const expected = callback(authorizationUrl);
57+
const input = {
58+
authorizationUrl,
59+
returnUrl: "https://app.t3.codes/settings/providers?environmentId=remote-one&instanceId=work",
60+
environmentId: EnvironmentId.make("remote-one"),
61+
instanceId: ProviderInstanceId.make("work"),
62+
flowId: "flow-one",
63+
};
64+
await receiveCodexAuthCallback(
65+
authorizationUrl,
66+
async () => {
67+
const response = await fetch(expected, { redirect: "manual" });
68+
expect(response.status).toBe(303);
69+
const delivery = response.headers.get("location")!;
70+
expect(new URL(delivery).searchParams.has("code")).toBe(false);
71+
expect(readCodexAuthDelivery(delivery)?.callbackUrl).toBe(expected);
72+
expect(readCodexAuthDelivery(delivery)?.returnUrl).toBe(input.returnUrl);
73+
return true;
74+
},
75+
(url) => codexAuthDeliveryUrl(input, url),
76+
);
77+
});
78+
it("cancels and releases its listener so exact-port reauthorization can run again", async () => {
79+
const authorizationUrl = request(await freePort());
80+
await expect(
81+
receiveCodexAuthCallback(authorizationUrl, async () => {
82+
cancelCodexAuthCallback(authorizationUrl);
83+
return true;
84+
}),
85+
).rejects.toThrow("cancelled");
86+
expect(
87+
await receiveCodexAuthCallback(authorizationUrl, async () => {
88+
await fetch(callback(authorizationUrl));
89+
return true;
90+
}),
91+
).toBe(callback(authorizationUrl));
92+
});
93+
it("allows two accounts to complete independently", async () => {
94+
const a = request(await freePort(), "a".repeat(43));
95+
const b = request(await freePort(), "c".repeat(43));
96+
const openedA = Promise.withResolvers<void>();
97+
const openedB = Promise.withResolvers<void>();
98+
const receiveA = receiveCodexAuthCallback(a, async () => {
99+
openedA.resolve();
100+
await openedB.promise;
101+
await fetch(callback(a));
102+
return true;
103+
});
104+
const receiveB = receiveCodexAuthCallback(b, async () => {
105+
openedB.resolve();
106+
await openedA.promise;
107+
await fetch(callback(b));
108+
return true;
109+
});
110+
expect(await Promise.all([receiveA, receiveB])).toEqual([callback(a), callback(b)]);
111+
});
112+
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export {
2+
CodexAuthCallbackError,
3+
cancelCodexAuthCallback,
4+
receiveCodexAuthCallback,
5+
} from "@t3tools/shared/codexAuthCallback";

‎apps/desktop/src/app/DesktopClerk.test.ts‎

Lines changed: 146 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// @effect-diagnostics nodeBuiltinImport:off globalFetchInEffect:off - Hosted handoff test uses a real localhost listener without an OpenAI account.
2+
import * as NodeHttp from "node:http";
3+
import { codexAuthHandoffUrl, readCodexAuthDelivery } from "@t3tools/shared/codexAuthHandoff";
4+
import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
5+
import { HostProcessArguments } from "@t3tools/shared/hostProcess";
16
import { assert, describe, it } from "@effect/vitest";
27
import * as Cause from "effect/Cause";
38
import * as Effect from "effect/Effect";
@@ -22,14 +27,24 @@ vi.mock("@clerk/electron/storage", () => ({
2227
storage: storageMock,
2328
}));
2429

30+
import * as Option from "effect/Option";
2531
import * as Exit from "effect/Exit";
2632
import * as FileSystem from "effect/FileSystem";
2733
import * as ElectronApp from "../electron/ElectronApp.ts";
34+
import * as ElectronShell from "../electron/ElectronShell.ts";
2835
import * as ElectronWindow from "../electron/ElectronWindow.ts";
2936
import * as DesktopClerk from "./DesktopClerk.ts";
3037
import * as DesktopEnvironment from "./DesktopEnvironment.ts";
3138

32-
const makeDesktopClerkLayer = (isDevelopment = true, events: string[] = []) => {
39+
const makeDesktopClerkLayer = (
40+
isDevelopment = true,
41+
events: string[] = [],
42+
shell: ElectronShell.ElectronShell["Service"] = {
43+
openExternal: () => Effect.succeed(true),
44+
openSystemSettings: () => Effect.succeed(false),
45+
copyText: () => Effect.void,
46+
},
47+
) => {
3348
const environment = DesktopEnvironment.DesktopEnvironment.of({
3449
stateDir: "/tmp/t3-state",
3550
isDevelopment,
@@ -51,6 +66,7 @@ const makeDesktopClerkLayer = (isDevelopment = true, events: string[] = []) => {
5166
Layer.mergeAll(
5267
Layer.succeed(DesktopEnvironment.DesktopEnvironment, environment),
5368
Layer.succeed(ElectronApp.ElectronApp, electronApp),
69+
Layer.succeed(ElectronShell.ElectronShell, shell),
5470
FileSystem.layerNoop({ exists: () => Effect.succeed(false) }),
5571
),
5672
),
@@ -162,7 +178,7 @@ describe("DesktopClerk", () => {
162178

163179
assert.isTrue(Exit.isSuccess(exit));
164180
assert.equal(quit.mock.calls.length, 0);
165-
assert.deepEqual(registeredEvents, ["second-instance"]);
181+
assert.deepEqual(registeredEvents, ["open-url", "second-instance"]);
166182
}).pipe(
167183
Effect.provide(makeDesktopClerkLayer()),
168184
Effect.provideService(ElectronApp.ElectronApp, electronApp),
@@ -198,3 +214,131 @@ describe("DesktopClerk", () => {
198214
);
199215
});
200216
});
217+
218+
it.effect(
219+
"provider auth deep links navigate and reveal the running desktop without handling Clerk URLs",
220+
() => {
221+
storageMock.mockReturnValue(storageAdapter);
222+
createClerkBridgeMock.mockReturnValue({ cleanup: vi.fn(), isPrimaryInstance: true });
223+
const listeners = new Map<string, (...args: unknown[]) => void>();
224+
const revealed = Promise.withResolvers<void>();
225+
const loadURL = vi.fn(async (_url: string) => undefined);
226+
const window = { loadURL };
227+
const electronApp = {
228+
on: (name: string, listener: (...args: unknown[]) => void) =>
229+
Effect.sync(() => {
230+
listeners.set(name, listener);
231+
}),
232+
} as unknown as ElectronApp.ElectronApp["Service"];
233+
const electronWindow = {
234+
currentMainOrFirst: Effect.succeed(Option.some(window)),
235+
reveal: () => Effect.sync(() => revealed.resolve()),
236+
} as unknown as ElectronWindow.ElectronWindow["Service"];
237+
return Effect.gen(function* () {
238+
const clerk = yield* DesktopClerk.DesktopClerk;
239+
yield* clerk.configure;
240+
const event = { preventDefault: vi.fn() };
241+
listeners.get("open-url")!(event, "t3code-dev://app/auth/callback?code=clerk-code");
242+
listeners.get("open-url")!(event, "t3code://app/welcome");
243+
assert.equal(loadURL.mock.calls.length, 0);
244+
assert.equal(event.preventDefault.mock.calls.length, 0);
245+
listeners.get("second-instance")!({}, [
246+
"t3",
247+
"t3code-dev://app/settings/providers?instanceId=work&code=never-forward",
248+
]);
249+
yield* Effect.promise(() => revealed.promise);
250+
assert.deepEqual(loadURL.mock.calls, [
251+
["t3code-dev://app/settings/providers?instanceId=work"],
252+
]);
253+
listeners.get("open-url")!(event, "t3code-dev://app/welcome#agents:machine-id");
254+
assert.equal(event.preventDefault.mock.calls.length, 1);
255+
}).pipe(
256+
Effect.scoped,
257+
Effect.provide(makeDesktopClerkLayer()),
258+
Effect.provideService(ElectronApp.ElectronApp, electronApp),
259+
Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),
260+
);
261+
},
262+
);
263+
264+
for (const entry of ["startup", "open-url"] as const) {
265+
it.effect(`receives hosted web sign-in through the desktop ${entry} handler`, () =>
266+
Effect.gen(function* () {
267+
storageMock.mockReturnValue(storageAdapter);
268+
createClerkBridgeMock.mockReturnValue({ cleanup: vi.fn(), isPrimaryInstance: true });
269+
const port = yield* Effect.promise(async () => {
270+
const server = NodeHttp.createServer();
271+
await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
272+
const address = server.address();
273+
if (!address || typeof address === "string") throw new Error("address");
274+
await new Promise<void>((resolve) => server.close(() => resolve()));
275+
return address.port;
276+
});
277+
const authorize = new URL("https://auth.openai.com/api/accounts/authorize");
278+
authorize.search = new URLSearchParams({
279+
client_id: "dynamic_agent_client",
280+
response_type: "code",
281+
redirect_uri: `http://127.0.0.1:${port}/auth/callback`,
282+
state: "a".repeat(43),
283+
code_challenge_method: "S256",
284+
code_challenge: "b".repeat(43),
285+
}).toString();
286+
const request = {
287+
authorizationUrl: authorize.toString(),
288+
returnUrl: "https://app.t3.codes/welcome#agents:remote-one",
289+
environmentId: EnvironmentId.make("remote-one"),
290+
instanceId: ProviderInstanceId.make("work"),
291+
flowId: "flow-one",
292+
};
293+
const link = codexAuthHandoffUrl(request, true);
294+
const delivered = Promise.withResolvers<string>();
295+
const shell = ElectronShell.ElectronShell.of({
296+
openExternal: (value) =>
297+
Effect.promise(async () => {
298+
const url = new URL(String(value));
299+
const callback = new URL(url.searchParams.get("redirect_uri")!);
300+
callback.search = new URLSearchParams({
301+
state: url.searchParams.get("state")!,
302+
code: "test-code",
303+
client_id: "oaiapp_test",
304+
}).toString();
305+
const response = await fetch(callback, { redirect: "manual" });
306+
delivered.resolve(response.headers.get("location")!);
307+
return true;
308+
}),
309+
openSystemSettings: () => Effect.succeed(false),
310+
copyText: () => Effect.void,
311+
});
312+
const listeners = new Map<string, (...args: unknown[]) => void>();
313+
const electronApp = {
314+
whenReady: Effect.void,
315+
on: (name: string, listener: (...args: unknown[]) => void) =>
316+
Effect.sync(() => {
317+
listeners.set(name, listener);
318+
}),
319+
} as unknown as ElectronApp.ElectronApp["Service"];
320+
yield* Effect.gen(function* () {
321+
const clerk = yield* DesktopClerk.DesktopClerk;
322+
yield* clerk.configure;
323+
if (entry === "open-url") {
324+
const event = { preventDefault: vi.fn() };
325+
listeners.get("open-url")!(event, link);
326+
assert.strictEqual(event.preventDefault.mock.calls.length, 1);
327+
}
328+
const delivery = readCodexAuthDelivery(yield* Effect.promise(() => delivered.promise));
329+
assert.strictEqual(delivery?.environmentId, request.environmentId);
330+
assert.strictEqual(delivery?.instanceId, request.instanceId);
331+
assert.strictEqual(delivery?.flowId, request.flowId);
332+
assert.strictEqual(delivery?.returnUrl, request.returnUrl);
333+
}).pipe(
334+
Effect.provide(makeDesktopClerkLayer(true, [], shell)),
335+
Effect.provideService(HostProcessArguments, entry === "startup" ? ["t3", link] : ["t3"]),
336+
Effect.provideService(ElectronApp.ElectronApp, electronApp),
337+
Effect.provideService(
338+
ElectronWindow.ElectronWindow,
339+
{} as ElectronWindow.ElectronWindow["Service"],
340+
),
341+
);
342+
}).pipe(Effect.scoped),
343+
);
344+
}

0 commit comments

Comments
 (0)