The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 05:45 UTC
feat(device): read the EAS access token from a secret provider (#27763)
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Yordis Prieto committed
Nov 3, 2026 at 16:15 UTC
bd3cc5c22886f2dfb3b20eedbcfbbbbab67e466d
14 files changed
+277
-63
apps/server/src/device/DeviceService.test.ts
+13
-1
@@ -18,6 +18,7 @@ import * as Exit from "effect/Exit";
18
import * as Deferred from "effect/Deferred";
19
import * as Fiber from "effect/Fiber";
20
import * as FileSystem from "effect/FileSystem";
21
+import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
22
import * as Layer from "effect/Layer";
23
import * as Option from "effect/Option";
24
import * as PubSub from "effect/PubSub";
@@ -534,6 +535,11 @@ describe("device setup consent", () => {
535
);
536
});
537
538
+const layerSecretResolver = Layer.succeed(SecretResolver.SecretResolver, {
539
+ read: (references) => Effect.succeed(references.map(() => undefined)),
540
+ invalidate: () => Effect.void,
541
+});
542
+
543
it.effect("publishes boot progress and does not restore sessions after support is disabled", () =>
544
Effect.gen(function* () {
545
const started = yield* Deferred.make<void>();
@@ -1437,7 +1443,12 @@ it.effect("reconciles SSH host settings without publishing no-op changes", () =>
1443
}).pipe(
1444
Effect.scoped,
1445
Effect.provide(
1440
- Layer.mergeAll(ServerSettings.layerTest(), NodeServices.layer, NodeCrypto.layer),
1446
+ Layer.mergeAll(
1447
+ ServerSettings.layerTest(),
1448
+ layerSecretResolver,
1449
+ NodeServices.layer,
1450
+ NodeCrypto.layer,
1451
+ ),
1452
),
1453
),
1454
);
@@ -1496,6 +1507,7 @@ it.effect("a failed tool update reports npm's exit code but not its output", ()
1507
Effect.provide(
1508
Layer.mergeAll(
1509
ServerSettings.layerTest({ enableDeviceSupport: true }),
1510
+ layerSecretResolver,
1511
ServerConfig.layerTest(process.cwd(), { prefix: "t3-device-update-" }),
1512
NodeCrypto.layer,
1513
NetService.layer,
apps/server/src/device/DeviceService.ts
+12
-3
@@ -68,12 +68,14 @@ import { isLocalSshDeviceHost, remoteSshDeviceHosts } from "./localSshDeviceHost
68
69
import { readDeviceDetail, runDeviceAction } from "./DeviceActions.ts";
70
import * as ProcessRunner from "../processRunner.ts";
71
+import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
72
+import * as SecretResolverLayer from "../secrets/SecretResolver.ts";
73
import * as DeviceHost from "./DeviceHost.ts";
74
import * as SshDeviceHost from "./SshDeviceHost.ts";
75
import * as EasDeviceHost from "./EasDeviceHost.ts";
76
import * as SimlockDeviceHost from "./SimlockDeviceHost.ts";
77
import * as HostProcess from "@t3tools/shared/HostProcess";
76
-import { makeExpoApi, resolveExpoCredential } from "./ExpoApi.ts";
78
+import { makeExpoApi } from "./ExpoApi.ts";
79
import * as Exit from "effect/Exit";
80
import * as LocalDeviceHost from "./LocalDeviceHost.ts";
81
@@ -1220,6 +1222,7 @@ export const make = Effect.gen(function* () {
1222
const path = yield* Path.Path;
1223
const runner = yield* ProcessRunner.ProcessRunner;
1224
const settings = yield* ServerSettings.ServerSettingsService;
1225
+ const secrets = yield* SecretResolver.SecretResolver;
1226
const scope = yield* Scope.Scope;
1227
const hosts = new Map<DeviceHostId, DeviceHost.DeviceHost["Service"]>([
1228
[localHost.id, localHost],
@@ -1537,7 +1540,10 @@ export const make = Effect.gen(function* () {
1540
? ""
1541
: ((yield* settings.getSettings).easDeviceHosts.find((host) => host.id === input.hostId)
1542
?.accessToken ?? "");
1540
- const credential = yield* resolveExpoCredential(input.accessToken ?? saved);
1543
+ const credential = yield* EasDeviceHost.resolveSavedExpoCredential(
1544
+ secrets,
1545
+ input.accessToken ?? saved,
1546
+ );
1547
const viewer = yield* makeExpoApi(yield* HttpClient.HttpClient, credential).viewer;
1548
return { signedInAs: viewer.name, credentialSource: credential.source, apps: viewer.apps };
1549
},
@@ -1618,7 +1624,10 @@ export const make = Effect.gen(function* () {
1624
};
1625
});
1626
1621
-export const layer = Layer.effect(DeviceService, make).pipe(Layer.provide(LocalDeviceHost.layer));
1627
+export const layer = Layer.effect(DeviceService, make).pipe(
1628
+ Layer.provide(LocalDeviceHost.layer),
1629
+ Layer.provide(SecretResolverLayer.layer),
1630
+);
1631
1632
export const stateStream = (service: DeviceService["Service"]): Stream.Stream<DeviceServiceState> =>
1633
Stream.unwrap(
apps/server/src/device/EasDeviceHost.test.ts
+76
-2
@@ -1,8 +1,8 @@
1
import { describe, expect, it } from "@effect/vitest";
2
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
-import { type EasDeviceHostConfig, ThreadId } from "@t3tools/contracts";
5
-import * as HostProcess from "@t3tools/shared/HostProcess";
4
+import { type EasDeviceHostConfig, SecretProviderId, ThreadId } from "@t3tools/contracts";
5
+import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
6
import * as Deferred from "effect/Deferred";
7
import * as Effect from "effect/Effect";
8
import * as Fiber from "effect/Fiber";
@@ -13,6 +13,7 @@ import * as Path from "effect/Path";
13
import * as Scope from "effect/Scope";
14
import * as TestClock from "effect/testing/TestClock";
15
import { HttpClient, HttpClientResponse } from "effect/http";
16
+import * as HostProcess from "@t3tools/shared/HostProcess";
17
18
import * as ServerConfig from "../config.ts";
19
import * as ProcessRunner from "../processRunner.ts";
@@ -228,9 +229,24 @@ const fakeExpo = (
229
return { http, named, stopped, allowPreview, allowCreate, releases, previews };
230
};
231
232
+const makeSecretResolver = (values: Record<string, string> = {}) =>
233
+ Layer.succeed(SecretResolver.SecretResolver, {
234
+ read: (references) =>
235
+ Effect.succeed(references.map((reference) => values[reference.reference])),
236
+ invalidate: () => Effect.void,
237
+ });
238
+
239
+const layerWith = (secrets: Layer.Layer<SecretResolver.SecretResolver>) =>
240
+ Layer.mergeAll(
241
+ ProcessRunner.layer,
242
+ ServerConfig.layerTest(process.cwd(), { prefix: "t3-eas-host-" }),
243
+ secrets,
244
+ ).pipe(Layer.provideMerge(NodeServices.layer));
245
+
246
const layer = Layer.mergeAll(
247
ProcessRunner.layer,
248
ServerConfig.layerTest(process.cwd(), { prefix: "t3-eas-host-" }),
249
+ makeSecretResolver(),
250
).pipe(Layer.provideMerge(NodeServices.layer));
251
252
const makeHost = (
@@ -299,6 +315,64 @@ describe("EAS Simulator host", () => {
315
}).pipe(Effect.scoped, Effect.provide(layer)),
316
);
317
318
+ it.effect("reads its token from the secret provider the setting names", () =>
319
+ Effect.gen(function* () {
320
+ const expo = fakeExpo();
321
+ const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
322
+ const host = yield* makeHost(expo, config({ accessToken: source }), yield* Scope.make());
323
+ const ready = yield* host.ensureReady(() => Effect.void);
324
+ const [catalogDevice] = (yield* ready.devices.list).devices;
325
+ expect(yield* ready.devices.boot(catalogDevice!)).toBe("session-1");
326
+ }).pipe(
327
+ Effect.scoped,
328
+ Effect.provide(layerWith(makeSecretResolver({ "expo#token": "expo-token" }))),
329
+ ),
330
+ );
331
+
332
+ it.effect("fails instead of using another Expo login when its secret cannot be read", () =>
333
+ Effect.gen(function* () {
334
+ const expo = fakeExpo();
335
+ const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
336
+ const host = yield* makeHost(expo, config({ accessToken: source }), yield* Scope.make()).pipe(
337
+ Effect.provideService(HostProcess.Environment, { EXPO_TOKEN: "expo-token" }),
338
+ );
339
+ const ready = yield* host.ensureReady(() => Effect.void);
340
+ const [catalogDevice] = (yield* ready.devices.list).devices;
341
+ const failure = yield* ready.devices.boot(catalogDevice!).pipe(Effect.flip);
342
+ expect(failure.message).toContain('secret provider "homelab"');
343
+ expect(expo.named("T3CreateEasSimulatorSession")).toHaveLength(0);
344
+ }).pipe(Effect.scoped, Effect.provide(layer)),
345
+ );
346
+
347
+ it.effect("still stops its sessions when the secret becomes unreadable after they start", () => {
348
+ const readable = { value: true };
349
+ return Effect.gen(function* () {
350
+ const expo = fakeExpo();
351
+ const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
352
+ const scope = yield* Scope.make();
353
+ const host = yield* makeHost(expo, config({ accessToken: source }), scope);
354
+ const ready = yield* host.ensureReady(() => Effect.void);
355
+ const [catalogDevice] = (yield* ready.devices.list).devices;
356
+ expect(yield* ready.devices.boot(catalogDevice!)).toBe("session-1");
357
+
358
+ readable.value = false;
359
+ yield* ready.devices.shutdown({ ...catalogDevice!, id: "session-1" });
360
+ expect(expo.stopped()).toEqual(["session-1"]);
361
+ yield* Scope.close(scope, Exit.void);
362
+ }).pipe(
363
+ Effect.scoped,
364
+ Effect.provide(
365
+ layerWith(
366
+ Layer.succeed(SecretResolver.SecretResolver, {
367
+ read: (references) =>
368
+ Effect.succeed(references.map(() => (readable.value ? "expo-token" : undefined))),
369
+ invalidate: () => Effect.void,
370
+ }),
371
+ ),
372
+ ),
373
+ );
374
+ });
375
+
376
it.effect("runs an Android session through serve-emu beside an iOS one", () =>
377
Effect.gen(function* () {
378
const expo = fakeExpo();
apps/server/src/device/EasDeviceHost.ts
+29
-5
@@ -11,6 +11,7 @@ import {
11
DeviceOperationError,
12
type DevicePlatform,
13
type EasDeviceHostConfig,
14
+ type SettingsSecretValue,
15
} from "@t3tools/contracts";
16
import * as Cause from "effect/Cause";
17
import * as Clock from "effect/Clock";
@@ -32,6 +33,8 @@ import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite";
33
import * as HostProcess from "@t3tools/shared/HostProcess";
34
35
import * as ServerConfig from "../config.ts";
36
+import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
37
+import { requireSettingsSecret } from "../secrets/settingsSecretValue.ts";
38
import { releaseAgentDeviceSession } from "./AgentDeviceTarget.ts";
39
import * as DeviceHost from "./DeviceHost.ts";
40
import { findEasProjectId } from "./easProjectId.ts";
@@ -140,11 +143,21 @@ const decodePathSegment = (segment: string): string | null => {
143
}
144
};
145
146
+/**
147
+ * The Expo credential a host's setting holds or names. Every session bills the account behind
148
+ * it, so a named secret that cannot be read fails rather than falling back to another login.
149
+ */
150
+export const resolveSavedExpoCredential = (
151
+ secrets: SecretResolver.SecretResolver["Service"],
152
+ saved: SettingsSecretValue,
153
+) => requireSettingsSecret(secrets, saved).pipe(Effect.flatMap(resolveExpoCredential));
154
+
155
export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDeviceHostConfig) {
156
const http = yield* HttpClient.HttpClient;
157
const fs = yield* FileSystem.FileSystem;
158
const path = yield* Path.Path;
159
const server = yield* ServerConfig.ServerConfig;
160
+ const secrets = yield* SecretResolver.SecretResolver;
161
const services = yield* Effect.context<
162
FileSystem.FileSystem | Path.Path | Effect.Services<ReturnType<typeof findEasProjectId>>
163
>();
@@ -198,13 +211,24 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
211
...(cause === undefined ? {} : { cause }),
212
});
213
201
- const api: Effect.Effect<ExpoApi, DeviceHostUnavailableError> = resolveExpoCredential(
214
+ let lastApi: ExpoApi | undefined;
215
+ const api: Effect.Effect<ExpoApi, DeviceHostUnavailableError> = resolveSavedExpoCredential(
216
+ secrets,
217
config.accessToken,
218
).pipe(
219
Effect.map((credential) => makeExpoApi(http, credential)),
220
+ Effect.tap((expo) =>
221
+ Effect.sync(() => {
222
+ lastApi = expo;
223
+ }),
224
+ ),
225
Effect.provide(services),
226
Effect.mapError((error) => unavailable(error.message, error)),
227
);
228
+ /** Stopping a billed session must not depend on the secret still being readable; starting one must. */
229
+ const apiForStop = api.pipe(
230
+ Effect.catch((error) => (lastApi === undefined ? Effect.fail(error) : Effect.succeed(lastApi))),
231
+ );
232
233
/** A missing ledger is empty; an unreadable one is an error, never an empty list. */
234
const readLedger = fs.readFileString(ledgerPath).pipe(
@@ -626,7 +650,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
650
if (stale.length === 0 && unresolved.size === 0 && uncertain.size === 0 && !reapDue) return;
651
const reap = reapDue || uncertain.size > 0;
652
if (reap) reapedAt = now;
629
- const expo = yield* api.pipe(
653
+ const expo = yield* apiForStop.pipe(
654
// Without a credential no sweep can look; a record Expo would have
655
// listed by now still stops counting, so the limit is not held forever.
656
Effect.tapError(() =>
@@ -723,7 +747,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
747
Option.match(sessionFor(device.id), {
748
onNone: () => Effect.void,
749
onSome: (session) =>
726
- api.pipe(
750
+ apiForStop.pipe(
751
Effect.flatMap((expo) => stopTracked(expo, session)),
752
Effect.asVoid,
753
Effect.mapError(
@@ -853,7 +877,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
877
// Interrupted starts stop the sessions they created before this returns.
878
yield* FiberSet.clear(starts);
879
yield* FiberSet.clear(background);
856
- const expo = yield* api;
880
+ const expo = yield* apiForStop;
881
yield* Effect.forEach(
882
[...sessions.values()],
883
(session) => stopTracked(expo, session).pipe(Effect.ignore),
@@ -884,7 +908,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
908
// Each server signs in on its own, so one with no Expo credential answers for itself. Reading
909
// the credential is local; whether Expo accepts it is only known once a session starts.
910
const platformAvailability = (platform: DevicePlatform) =>
887
- resolveExpoCredential(config.accessToken).pipe(
911
+ resolveSavedExpoCredential(secrets, config.accessToken).pipe(
912
Effect.provide(services),
913
Effect.as({ platform, available: true }),
914
Effect.catch((error) =>
apps/server/src/secrets/settingsSecretValue.ts
+33
-2
@@ -1,7 +1,12 @@
1
-import { secretReferencesInSettings, withSettingsSecrets } from "@t3tools/contracts";
1
+import {
2
+ isSecretReference,
3
+ secretReferencesInSettings,
4
+ type SettingsSecretValue,
5
+ withSettingsSecrets,
6
+} from "@t3tools/contracts";
7
import type * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
8
import * as Effect from "effect/Effect";
4
-import type * as Schema from "effect/Schema";
9
+import * as Schema from "effect/Schema";
10
11
/**
12
* Replaces each reference in the slots `schema` declares as `SettingsSecretValue` with the secret
@@ -18,3 +23,29 @@ export const resolveSettingsSecrets = Effect.fn("SettingsSecrets.resolve")(funct
23
pending.map((slot, index) => ({ ...slot, value: values[index] ?? "" })),
24
);
25
});
26
+
27
+export class SettingsSecretUnresolvedError extends Schema.TaggedError<SettingsSecretUnresolvedError>()(
28
+ "SettingsSecretUnresolvedError",
29
+ { provider: Schema.String },
30
+) {
31
+ override get message(): string {
32
+ return `Could not read the credential from the secret provider "${this.provider}". Unlock or fix it in Settings, then try again.`;
33
+ }
34
+}
35
+
36
+/**
37
+ * The secret a credential setting holds or names. A named secret that cannot be read, or reads
38
+ * empty, fails instead of passing for a missing token, so callers that would fall back to another
39
+ * credential cannot silently switch accounts.
40
+ */
41
+export const requireSettingsSecret = Effect.fn("SettingsSecrets.require")(function* (
42
+ resolver: SecretResolver.SecretResolver["Service"],
43
+ value: SettingsSecretValue,
44
+) {
45
+ if (!isSecretReference(value)) return value;
46
+ const [secret] = yield* resolver.read([value]);
47
+ if (secret === undefined || secret.trim() === "") {
48
+ return yield* new SettingsSecretUnresolvedError({ provider: value.provider });
49
+ }
50
+ return secret;
51
+});
apps/server/src/serverSettings.test.ts
+19
@@ -1622,6 +1622,10 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
1622
provider: SecretProviderId.make("personal"),
1623
reference: "op://Private/Hub/key",
1624
};
1625
+ const easReference = {
1626
+ provider: SecretProviderId.make("personal"),
1627
+ reference: "op://Private/Expo/token",
1628
+ };
1629
const hub = UsageLimitSourceId.make("hub");
1630
const withUsage = yield* serverSettings.updateSettings({
1631
usageLimitSources: {
@@ -1632,6 +1636,17 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
1636
enabled: true,
1637
},
1638
},
1639
+ easDeviceHosts: [
1640
+ {
1641
+ kind: "eas",
1642
+ id: "eas",
1643
+ label: "EAS Simulator",
1644
+ accessToken: easReference,
1645
+ maxSessionMinutes: 30,
1646
+ idleMinutes: 10,
1647
+ maxConcurrentSessions: 2,
1648
+ },
1649
+ ],
1650
});
1651
const legacy = ServerSettingsModule.redactServerSettingsForClient(withUsage, {
1652
secretReferences: false,
@@ -1639,9 +1654,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
1654
assert.notInclude(JSON.stringify(legacy), "op://");
1655
assert.equal(legacy.sourceControlHosts.bitbucket?.accessToken, SECRET_REDACTED);
1656
assert.equal(legacy.usageLimitSources[hub]?.managementKey, SECRET_REDACTED);
1657
+ assert.equal(legacy.easDeviceHosts[0]?.accessToken, SECRET_REDACTED);
1658
const echoed = yield* serverSettings.updateSettings({
1659
sourceControlHosts: legacy.sourceControlHosts,
1660
usageLimitSources: legacy.usageLimitSources,
1661
+ easDeviceHosts: legacy.easDeviceHosts,
1662
});
1663
assert.deepEqual(echoed.sourceControlHosts.bitbucket?.accessToken, reference);
1664
assert.deepEqual(echoed.sourceControlHosts.github?.tokens, {
@@ -1649,6 +1666,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
1666
"ghe.acme.test": "ghp_ghe",
1667
});
1668
assert.deepEqual(echoed.usageLimitSources[hub]?.managementKey, usageReference);
1669
+ assert.deepEqual(echoed.easDeviceHosts[0]?.accessToken, easReference);
1670
assert.isTrue(Option.isSome(yield* stored("github", "tokens", "ghe.acme.test")));
1671
}).pipe(Effect.provide(layerServerSettingsWithSecrets())),
1672
);
@@ -1657,6 +1675,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
1675
Effect.sync(() => {
1676
// Shipped clients decode these as strings. Each must be covered by the older-client case above.
1677
assert.deepEqual(strictSecretReferencePaths(ServerSettings.ast), [
1678
+ "easDeviceHosts.[].accessToken",
1679
"usageLimitSources.*.managementKey",
1680
]);
1681
}),
apps/server/src/sourceControl/sourceControlHostSecrets.test.ts
+15
-2
@@ -1,5 +1,5 @@
1
import { assert, it } from "@effect/vitest";
2
-import { SecretProviderId, UsageLimitSourceId } from "@t3tools/contracts";
2
+import { DeviceHostId, SecretProviderId, UsageLimitSourceId } from "@t3tools/contracts";
3
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
4
import * as Effect from "effect/Effect";
5
@@ -139,7 +139,19 @@ it.effect("reads a collected reference again once it is invalidated", () =>
139
enabled: true,
140
},
141
} as const;
142
+ const easDeviceHosts = [
143
+ {
144
+ kind: "eas" as const,
145
+ id: DeviceHostId.make("ref"),
146
+ label: "Ref",
147
+ maxSessionMinutes: 30,
148
+ idleMinutes: 10,
149
+ maxConcurrentSessions: 2,
150
+ accessToken: source("expo#token"),
151
+ },
152
+ ];
153
cache.set("cliproxy#key", "stale");
154
+ cache.set("expo#token", "stale");
155
assert.deepEqual((yield* read()).bitbucket, {
156
email: "me@example.test",
157
accessToken: "stale",
@@ -147,9 +159,10 @@ it.effect("reads a collected reference again once it is invalidated", () =>
159
current = "rotated";
160
yield* invalidateSettingsSecrets(
161
resolver,
150
- Effect.succeed({ sourceControlHosts: hosts, usageLimitSources }),
162
+ Effect.succeed({ sourceControlHosts: hosts, usageLimitSources, easDeviceHosts }),
163
);
164
assert.isFalse(cache.has("cliproxy#key"));
165
+ assert.isFalse(cache.has("expo#token"));
166
assert.deepEqual((yield* read()).bitbucket, {
167
email: "me@example.test",
168
accessToken: "rotated",
apps/server/src/sourceControl/sourceControlHostSecrets.ts
+10
-1
@@ -104,15 +104,24 @@ const collectUsageLimitSecretReferences = (
104
isSecretReference(managementKey) ? [managementKey] : [],
105
);
106
107
+const collectEasSecretReferences = (
108
+ hosts: ServerSettings["easDeviceHosts"],
109
+): ReadonlyArray<SecretReference> =>
110
+ hosts.flatMap(({ accessToken }) => (isSecretReference(accessToken) ? [accessToken] : []));
111
+
112
/** Settings that cannot be read clear every cached secret, so a refresh never keeps a stale one. */
113
export const invalidateSettingsSecrets = Effect.fn("SettingsSecrets.invalidate")(function* <E>(
114
resolver: SecretResolver.SecretResolver["Service"],
110
- settings: Effect.Effect<Pick<ServerSettings, "sourceControlHosts" | "usageLimitSources">, E>,
115
+ settings: Effect.Effect<
116
+ Pick<ServerSettings, "sourceControlHosts" | "usageLimitSources" | "easDeviceHosts">,
117
+ E
118
+ >,
119
) {
120
const references = yield* settings.pipe(
121
Effect.map((current) => [
122
...collectSourceControlHostSecretReferences(current.sourceControlHosts),
123
...collectUsageLimitSecretReferences(current.usageLimitSources),
124
+ ...collectEasSecretReferences(current.easDeviceHosts),
125
]),
126
Effect.orElseSucceed(() => undefined),
127
);
apps/server/src/usage/UsageLimitSources.test.ts
+6
-2
@@ -5,6 +5,7 @@ import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretReso
5
import * as Effect from "effect/Effect";
6
import * as Layer from "effect/Layer";
7
import * as Schema from "effect/Schema";
8
+import * as Stream from "effect/Stream";
9
import { HttpClient, HttpClientResponse } from "effect/http";
10
11
import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
@@ -97,8 +98,11 @@ it.effect("reads a management key from its secret provider", () => {
98
});
99
return Effect.gen(function* () {
100
const sources = yield* UsageLimitSources.make;
100
- yield* sources.refresh;
101
- const snapshots = yield* sources.current;
101
+ const snapshots = yield* sources.streamChanges.pipe(
102
+ Stream.filter((next) => next.length > 0),
103
+ Stream.runHead,
104
+ Effect.flatMap(Effect.fromOption),
105
+ );
106
expect(snapshots.map(({ id, error }) => ({ id, error }))).toEqual([
107
{ id: "resolved-hub", error: undefined },
108
{
apps/web/src/components/settings/AddUsageLimitSourceDialog.tsx
+4
-3
@@ -36,14 +36,16 @@ export function AddUsageLimitSourceDialog({
36
const [url, setUrl] = useState("");
37
const secretSources = useSecretSources(environmentId);
38
const [keyDraft, setKeyDraft] = useState<string | SecretReference>("");
39
+ const [keyValid, setKeyValid] = useState(true);
40
const managementKey = typeof keyDraft === "string" ? keyDraft.trim() : keyDraft;
41
const trimmedUrl = url.trim();
41
- const canSave = trimmedUrl.length > 0 && managementKey !== "";
42
+ const canSave = keyValid && trimmedUrl.length > 0 && managementKey !== "";
43
44
const reset = () => {
45
setLabel("");
46
setUrl("");
47
setKeyDraft("");
48
+ setKeyValid(true);
49
};
50
51
const save = () => {
@@ -107,8 +109,7 @@ export function AddUsageLimitSourceDialog({
109
sources={secretSources}
110
onChange={(event) => setKeyDraft(event.target.value)}
111
onSecretChange={(secret) => setKeyDraft(secret ?? "")}
110
- onProviderPick={() => setKeyDraft("")}
111
- onReferenceReject={() => setKeyDraft("")}
112
+ onValidityChange={setKeyValid}
113
/>
114
</div>
115
<div className="grid gap-1.5">
apps/web/src/components/settings/EasDeviceHostEditor.tsx
+36
-10
@@ -3,9 +3,11 @@ import { useId, useRef, useState } from "react";
3
import * as Cause from "effect/Cause";
4
import * as Option from "effect/Option";
5
import {
6
+ isSecretReference,
7
type DeviceEasAccount,
8
type EasDeviceHostConfig,
9
type EnvironmentId,
10
+ type SettingsSecretValue,
11
} from "@t3tools/contracts";
12
import { XIcon } from "lucide-react";
13
@@ -25,7 +27,7 @@ import { Input } from "../ui/input";
27
import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
28
import { Spinner } from "../ui/spinner";
29
import { parseEasDeviceHostDraft } from "./easDeviceHostsSettings.logic";
28
-import { SecretInput } from "./SecretInput";
30
+import { SecretSourceInput, useSecretSources } from "./SecretSourceInput";
31
32
const FROM_THREAD_PROJECT = "thread-project";
33
@@ -57,9 +59,12 @@ export function EasDeviceHostEditor(props: {
59
const check = useAtomCommand(deviceEnvironment.easAccount, { reportFailure: false });
60
const [draft, setDraft] = useState(props.host);
61
const tokenId = useId();
62
+ const secretSources = useSecretSources(props.environmentId);
63
+ const [tokenValid, setTokenValid] = useState(true);
64
+ const [tokenInputKey, setTokenInputKey] = useState(0);
65
// A saved token arrives redacted; only a replacement or a clear changes it.
66
const [token, setToken] = useState<
62
- { kind: "saved" } | { kind: "new"; value: string } | { kind: "cleared" }
67
+ { kind: "saved" } | { kind: "new"; value: SettingsSecretValue } | { kind: "cleared" }
68
>(props.host.accessToken ? { kind: "saved" } : { kind: "cleared" });
69
// Checking on open names the saved project and shows a rejected credential
70
// before anything is changed. A manual check or a token edit replaces it.
@@ -87,13 +92,15 @@ export function EasDeviceHostEditor(props: {
92
accessToken:
93
token.kind === "saved" ? props.host.accessToken : token.kind === "new" ? token.value : "",
94
};
90
- const valid = Option.isSome(parseEasDeviceHostDraft(next));
95
+ const valid = tokenValid && Option.isSome(parseEasDeviceHostDraft(next));
96
// Why Save is off, for the limits the fields' ranges do not show.
97
const problem = valid
98
? null
94
- : draft.maxSessionMinutes > 0 && draft.idleMinutes >= draft.maxSessionMinutes
95
- ? "Idle minutes must be smaller than session minutes."
96
- : "Give the host a label and limits within the ranges shown.";
99
+ : !tokenValid
100
+ ? "Enter a valid secret reference."
101
+ : draft.maxSessionMinutes > 0 && draft.idleMinutes >= draft.maxSessionMinutes
102
+ ? "Idle minutes must be smaller than session minutes."
103
+ : "Give the host a label and limits within the ranges shown.";
104
const apps = account.status === "signed-in" ? account.account.apps : [];
105
106
// A check answers for the credential it was asked about: a later check or a
@@ -192,11 +199,28 @@ export function EasDeviceHostEditor(props: {
199
Expo access token
200
</label>
201
<div className="flex items-center gap-2">
195
- <SecretInput
202
+ <SecretSourceInput
203
+ key={tokenInputKey}
204
id={tokenId}
205
+ aria-label="Expo access token"
206
className="min-w-0 flex-1"
198
- configured={token.kind === "saved"}
199
- value={token.kind === "new" ? token.value : ""}
207
+ configured={token.kind === "saved" && typeof props.host.accessToken === "string"}
208
+ value={
209
+ token.kind === "new"
210
+ ? token.value
211
+ : token.kind === "saved" && isSecretReference(props.host.accessToken)
212
+ ? props.host.accessToken
213
+ : ""
214
+ }
215
+ sources={secretSources}
216
+ onValidityChange={(valid) => {
217
+ setTokenValid(valid);
218
+ resetAccount();
219
+ }}
220
+ onSecretChange={(secret) => {
221
+ setToken(secret ? { kind: "new", value: secret } : { kind: "cleared" });
222
+ resetAccount();
223
+ }}
224
disabled={props.busy}
225
placeholder="Optional"
226
onChange={(event) => {
@@ -221,6 +245,8 @@ export function EasDeviceHostEditor(props: {
245
aria-label="Clear access token"
246
onClick={() => {
247
setToken({ kind: "cleared" });
248
+ setTokenValid(true);
249
+ setTokenInputKey((key) => key + 1);
250
resetAccount();
251
}}
252
>
@@ -243,7 +269,7 @@ export function EasDeviceHostEditor(props: {
269
type="button"
270
size="sm"
271
variant="outline"
246
- disabled={props.busy || account.status === "checking"}
272
+ disabled={props.busy || !tokenValid || account.status === "checking"}
273
onClick={() => void checkAccount()}
274
>
275
{account.status === "checking" ? <Spinner size="xs" /> : null} Check account
apps/web/src/components/settings/SecretSourceInput.browser.test.tsx
+10
-18
@@ -23,7 +23,7 @@ async function commitReference(screen: Screen, value: string) {
23
describe("SecretSourceInput", () => {
24
it("moves a reference to another provider only once one is committed for it", async () => {
25
const onSecretChange = vi.fn();
26
- const onProviderPick = vi.fn();
26
+ const onValidityChange = vi.fn();
27
await using screen = await render(
28
<SecretSourceInput
29
aria-label="API key"
@@ -31,14 +31,14 @@ describe("SecretSourceInput", () => {
31
sources={sources}
32
onCommit={() => {}}
33
onSecretChange={onSecretChange}
34
- onProviderPick={onProviderPick}
34
+ onValidityChange={onValidityChange}
35
/>,
36
);
37
38
await userEvent.click(screen.getByRole("combobox", { name: "API key source" }));
39
await userEvent.click(screen.getByRole("option", { name: "Work" }));
40
expect(onSecretChange).not.toHaveBeenCalled();
41
- expect(onProviderPick).toHaveBeenCalledOnce();
41
+ expect(onValidityChange).toHaveBeenLastCalledWith(false);
42
await expect.element(reference(screen)).toHaveValue("");
43
44
await commitReference(screen, "op://Shared/OpenAI/credential");
@@ -46,6 +46,7 @@ describe("SecretSourceInput", () => {
46
provider: work,
47
reference: "op://Shared/OpenAI/credential",
48
});
49
+ expect(onValidityChange).toHaveBeenLastCalledWith(true);
50
});
51
52
it("removes the reference when its field is cleared", async () => {
@@ -69,7 +70,7 @@ describe("SecretSourceInput", () => {
70
71
it("rejects a reference 1Password cannot read", async () => {
72
const onSecretChange = vi.fn();
72
- const onReferenceReject = vi.fn();
73
+ const onValidityChange = vi.fn();
74
await using screen = await render(
75
<SecretSourceInput
76
aria-label="API key"
@@ -77,29 +78,20 @@ describe("SecretSourceInput", () => {
78
sources={sources}
79
onCommit={() => {}}
80
onSecretChange={onSecretChange}
80
- onReferenceReject={onReferenceReject}
81
+ onValidityChange={onValidityChange}
82
/>,
83
);
84
85
await commitReference(screen, "Private/OpenAI/credential");
86
expect(onSecretChange).not.toHaveBeenCalled();
86
- expect(onReferenceReject).toHaveBeenCalledOnce();
87
- await screen.rerender(
88
- <SecretSourceInput
89
- aria-label="API key"
90
- value=""
91
- sources={sources}
92
- onCommit={() => {}}
93
- onSecretChange={onSecretChange}
94
- onReferenceReject={onReferenceReject}
95
- />,
96
- );
87
+ expect(onValidityChange).toHaveBeenLastCalledWith(false);
88
await expect.element(reference(screen)).toHaveAttribute("aria-invalid", "true");
89
await expect.element(reference(screen)).toHaveValue("Private/OpenAI/credential");
99
- await commitReference(screen, "op://Private/OpenAI/corrected");
90
+ await commitReference(screen, "op://Private/OpenAI/replacement");
91
+ expect(onValidityChange).toHaveBeenLastCalledWith(true);
92
expect(onSecretChange).toHaveBeenCalledExactlyOnceWith({
93
provider: personal,
102
- reference: "op://Private/OpenAI/corrected",
94
+ reference: "op://Private/OpenAI/replacement",
95
});
96
});
97
});
apps/web/src/components/settings/SecretSourceInput.tsx
+8
-9
@@ -64,10 +64,8 @@ type SecretSourceInputProps = Omit<ComponentProps<typeof SecretInput>, "value" |
64
readonly value: string | SecretReference;
65
readonly sources: ReadonlyArray<SecretSource>;
66
readonly onSecretChange: (secret: SecretReference | undefined) => void;
67
- /** Called when a provider is picked, before a reference for it exists. */
68
- readonly onProviderPick?: () => void;
69
- /** Called when an edited reference is rejected, so the committed one no longer matches the field. */
70
- readonly onReferenceReject?: () => void;
67
+ /** Whether the selected source and committed field can be saved or used. */
68
+ readonly onValidityChange?: (valid: boolean) => void;
69
/** Places the parts in the caller's layout; `source` is null when there is nothing to pick. */
70
readonly children?: (parts: {
71
readonly source: ReactNode;
@@ -80,8 +78,7 @@ export function SecretSourceInput({
78
value,
79
sources,
80
onSecretChange,
83
- onProviderPick,
84
- onReferenceReject,
81
+ onValidityChange,
82
children,
83
...rest
84
}: SecretSourceInputProps) {
@@ -108,11 +105,12 @@ export function SecretSourceInput({
105
setRejectedReference(null);
106
if (value === STORED_VALUE || value === null) {
107
setPendingProvider(null);
108
+ onValidityChange?.(true);
109
if (secret !== undefined) onSecretChange(undefined);
110
return;
111
}
112
const next = value as SecretProviderId;
115
- if (next !== secret?.provider) onProviderPick?.();
113
+ onValidityChange?.(next === secret?.provider);
114
setPendingProvider(next === secret?.provider ? null : next);
115
}}
116
>
@@ -157,6 +155,7 @@ export function SecretSourceInput({
155
onCommit={(next) => {
156
if (next.trim().length === 0) {
157
setRejectedReference(null);
158
+ onValidityChange?.(pendingProvider === null && secret !== undefined);
159
if (pendingProvider === null && secret !== undefined) onSecretChange(undefined);
160
return;
161
}
@@ -166,12 +165,12 @@ export function SecretSourceInput({
165
definition?.isReference(decoded.value.reference) === false
166
) {
167
setRejectedReference(next);
169
- if (onReferenceReject !== undefined) setPendingProvider(provider);
170
- onReferenceReject?.();
168
+ onValidityChange?.(false);
169
return;
170
}
171
setRejectedReference(null);
172
setPendingProvider(null);
173
+ onValidityChange?.(true);
174
onSecretChange(decoded.value);
175
}}
176
autoComplete="off"
packages/contracts/src/device.ts
+6
-5
@@ -3,6 +3,7 @@ import * as Schema from "effect/Schema";
3
import * as SchemaTransformation from "effect/SchemaTransformation";
4
5
import { ThreadId, TrimmedNonEmptyString, TrimmedString } from "./baseSchemas.ts";
6
+import { SettingsSecretValue } from "./settingsSecretValue.ts";
7
8
export const DevicePlatform = Schema.Literals(["ios", "android"]);
9
export type DevicePlatform = typeof DevicePlatform.Type;
@@ -40,11 +41,11 @@ export const EasDeviceHostConfig = Schema.Struct({
41
/** EAS project that sessions run under, when the project's app config does not name one. */
42
appId: Schema.optional(TrimmedNonEmptyString),
43
/**
43
- * Expo access token, kept in the secret store. When empty the server uses
44
- * EXPO_TOKEN, then the `eas login` session. This is `secretSetting` from
45
- * settings.ts, which imports this module.
44
+ * Expo access token, kept in the secret store, or the secret provider to read
45
+ * it from. When empty the server uses EXPO_TOKEN, then the `eas login` session.
46
+ * This is `secretSetting` from settings.ts, which imports this module.
47
*/
47
- accessToken: TrimmedString.pipe(
48
+ accessToken: SettingsSecretValue.pipe(
49
Schema.withDecodingDefaultKey(Effect.succeed("")),
50
Schema.annotateKey({ settingsSecret: true }),
51
),
@@ -116,7 +117,7 @@ export const SimlockDeviceHostConfigs = Schema.Array(SimlockDeviceHostConfig).ch
117
export const DeviceEasAccountInput = Schema.Struct({
118
/** A saved EAS host whose stored token is checked when no new token is given. */
119
hostId: Schema.optional(DeviceHostId),
119
- accessToken: Schema.optional(TrimmedString),
120
+ accessToken: Schema.optional(SettingsSecretValue),
121
});
122
export type DeviceEasAccountInput = typeof DeviceEasAccountInput.Type;
123