@levr-one/auth 1.1.8 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,368 @@
1
+ /**
2
+ * Local-checkout environment resolution: which backend, auth-web and client a
3
+ * checkout of this monorepo serves, read from its own `apps/backender` env.
4
+ *
5
+ * A LEAF module on purpose: it imports nothing else from this package (the
6
+ * `TqConfig` import is type-only and erased), so both `config.ts` and
7
+ * `token-store.ts` can use it without the import cycle `token-store.ts` exists
8
+ * to avoid (`config.ts` imports `token-store.ts`). internal moved these
9
+ * helpers here from `config.ts`, which still re-exports the public ones.
10
+ */
11
+ import * as fs from 'fs';
12
+ import * as path from 'path';
13
+ /**
14
+ * Returns true when running inside a test runner (Vitest, Jest, etc.).
15
+ */
16
+ export function isTestEnv() {
17
+ return (process.env.VITEST !== undefined ||
18
+ process.env.NODE_ENV === 'test' ||
19
+ process.env.JEST_WORKER_ID !== undefined);
20
+ }
21
+ /**
22
+ * Detect whether the developer is running in TLS dev mode (mkcert + DEV_TLS).
23
+ *
24
+ * Resolution order:
25
+ * 1. Tests (Vitest/Jest/NODE_ENV=test) → always false (deterministic).
26
+ * 2. Explicit `DEV_TLS` env var → 'true'/'false' wins.
27
+ * 3. `DEV_TLS` in the backender's env → the setting that actually decides
28
+ * whether the backender serves TLS.
29
+ *
30
+ * Step 3 used to probe for `apps/backender/certs/dev.crt` and treat its
31
+ * PRESENCE as "TLS is on". That tested a proxy for the real question: the cert
32
+ * is written once by scripts/dev-setup-tls.sh and never removed when TLS is
33
+ * turned off, so any machine that had ever run it resolved TLS mode forever.
34
+ *
35
+ * The walk-up from cwd is retained, so this still works from the repo root, an
36
+ * app subdirectory, or a worktree.
37
+ *
38
+ * Keep in sync with `apps/sync-server/src/auth.ts:isLocalTlsMode()` — the two
39
+ * are duplicated verbatim (sync-server does not depend on this package). The
40
+ * bodies are kept byte-identical so a plain `diff` verifies the claim; that is
41
+ * also why the quote check below is split across lines, since this package
42
+ * formats at printWidth 80 and sync-server at 100.
43
+ */
44
+ export function isLocalTlsMode() {
45
+ if (isTestEnv())
46
+ return false;
47
+ if (process.env.DEV_TLS === 'true')
48
+ return true;
49
+ if (process.env.DEV_TLS === 'false')
50
+ return false;
51
+ return devTlsFromBackenderEnv();
52
+ }
53
+ /**
54
+ * `parseDevTls` reproduces three dotenv behaviours the obvious regex gets
55
+ * wrong. Each failed CLOSED — it missed a real `DEV_TLS=true` and so dialled
56
+ * http:// at a TLS backender, the exact bug this file exists to fix, mirrored:
57
+ * - `export DEV_TLS=true` — the form docs/guides/dev-tls-setup.md prints
58
+ * - `DEV_TLS=true # note` — trailing comment on an unquoted value
59
+ * - the key repeated — dotenv takes the LAST occurrence, not the first
60
+ *
61
+ * dotenv itself is not used: `packages/auth` does not depend on it, and this
62
+ * helper is duplicated verbatim between the two files (see the note above).
63
+ */
64
+ export function parseDevTls(contents) {
65
+ // Global: the LAST assignment wins, matching dotenv.
66
+ const re = /^[ \t]*(?:export[ \t]+)?DEV_TLS[ \t]*=[ \t]*(.*)$/gm;
67
+ let raw;
68
+ for (const m of contents.matchAll(re))
69
+ raw = m[1];
70
+ if (raw === undefined)
71
+ return undefined;
72
+ let value = raw.trim();
73
+ const quote = value[0];
74
+ const isQuote = quote === '"' || quote === "'";
75
+ if (isQuote && value.length > 1 && value.endsWith(quote)) {
76
+ value = value.slice(1, -1);
77
+ }
78
+ else {
79
+ // Unquoted only: everything from `#` onward is a comment.
80
+ value = (value.split('#')[0] ?? '').trim();
81
+ }
82
+ return value === 'true';
83
+ }
84
+ function devTlsFromBackenderEnv() {
85
+ let dir = process.cwd();
86
+ for (let i = 0; i < 10; i++) {
87
+ // `.env.worktree` FIRST — it outranks `.env` for the backender, because
88
+ // apps/backender/src/env.ts loads it first and dotenv does not overwrite
89
+ // an already-set key. Reading only `.env` resolves the wrong protocol in a
90
+ // worktree that overrides DEV_TLS.
91
+ for (const name of ['.env.worktree', '.env']) {
92
+ const envPath = path.join(dir, 'apps/backender', name);
93
+ if (!fs.existsSync(envPath))
94
+ continue;
95
+ try {
96
+ const parsed = parseDevTls(fs.readFileSync(envPath, 'utf8'));
97
+ if (parsed !== undefined)
98
+ return parsed;
99
+ }
100
+ catch {
101
+ // Unreadable env file must not silently select TLS — fail safe.
102
+ return false;
103
+ }
104
+ }
105
+ const parent = path.dirname(dir);
106
+ if (parent === dir)
107
+ break;
108
+ dir = parent;
109
+ }
110
+ return false;
111
+ }
112
+ /**
113
+ * Accept an env value ONLY if it is a bare `http(s)` origin — scheme, host,
114
+ * optional port, and nothing else. Returns the normalised origin, or
115
+ * `undefined` for anything that is not one.
116
+ *
117
+ * This exists because `API_BASE_URL` does not mean the same thing in every
118
+ * env file. In a worktree's `apps/backender/.env` it is that backender's own
119
+ * origin (`http://localhost:8580`) — the value `tq:env local` wants. In the
120
+ * main checkout under DEV_TLS it is `https://ai.levr.test:3020/api`, the URL
121
+ * the BROWSER should call: the client SPA's `/api` proxy. Accepting the
122
+ * second overwrote a correctly-computed `LOCAL_HTTPS` preset with a value
123
+ * that was wrong twice over — wrong host role, and a client dev-server port
124
+ * that is usually not listening — so every stdio MCP server dialled a dead
125
+ * host and reported an opaque `fetch failed`.
126
+ *
127
+ * The path is the discriminator **for the local checkout specifically** — the
128
+ * name says `Local` for that reason. It is NOT a universal truth that a
129
+ * backend base URL has no path: this repo's own deploys set
130
+ * `API_BASE_URL=https://ai.levr.now/api` (`apps/backender/chart/stage.yaml:35`)
131
+ * and `https://ai.levr.one/api` (`chart/prod.yaml:74`), and `setup-mcp.ts`
132
+ * deliberately accepts that shape because the levr MCP endpoint IS reached
133
+ * through the SPA proxy. Do not reuse this helper where deployed values are
134
+ * in scope — it would reject a valid production URL. internal.
135
+ *
136
+ * It fails SAFE — anything ambiguous declines to override the preset instead
137
+ * of silently replacing it. Do NOT weaken this back to a `^https?://` prefix
138
+ * test; that is precisely the check the proxy URL passed.
139
+ *
140
+ * Kept here rather than in `cli.ts` because that module is a self-executing
141
+ * CLI (importing it runs the command switch), so a pure helper there cannot
142
+ * be unit-tested — the same reason `parseDevTls` lives in this file.
143
+ *
144
+ * internal.
145
+ */
146
+ export function parseLocalBackenderOrigin(raw) {
147
+ if (raw === undefined)
148
+ return undefined;
149
+ const trimmed = raw.trim().replace(/\/+$/, '');
150
+ if (!trimmed)
151
+ return undefined;
152
+ // Reject on the RAW text, BEFORE parsing. WHATWG normalises during parse:
153
+ // `/foo/..` collapses to `/`, and a bare trailing `?` or `#` reports an
154
+ // EMPTY `search`/`hash`. A guard that reads only the parsed URL therefore
155
+ // cannot see the two shapes it most needs to reject — which is precisely
156
+ // the bug the first cut of this function shipped (internal): it validated
157
+ // `parsed` and then returned the raw string.
158
+ if (/[?#]/.test(trimmed))
159
+ return undefined;
160
+ // WHATWG also reads `\\` as `/` for http(s), so `http:\\host\\x` would
161
+ // slip past the raw-path check below; and any `@` is userinfo, which never
162
+ // belongs here (an EMPTY one, `http://@host`, parses to no credentials and
163
+ // would otherwise pass the check further down). internal review F-001.
164
+ if (/[\\@]/.test(trimmed))
165
+ return undefined;
166
+ const afterScheme = trimmed.replace(/^https?:\/\//i, '');
167
+ if (afterScheme.includes('/'))
168
+ return undefined;
169
+ let parsed;
170
+ try {
171
+ parsed = new URL(trimmed);
172
+ }
173
+ catch {
174
+ return undefined;
175
+ }
176
+ if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
177
+ return undefined;
178
+ }
179
+ // Credentials never belong in a backend base URL, and silently stripping
180
+ // them would write a different URL than the author wrote.
181
+ if (parsed.username || parsed.password)
182
+ return undefined;
183
+ // Return the PARSED origin, never the raw text — that pairing is what makes
184
+ // the guards above load-bearing rather than decorative.
185
+ return parsed.origin;
186
+ }
187
+ /**
188
+ * Read one key out of dotenv file contents, reproducing the behaviours
189
+ * `parseDevTls` documents twenty lines above: an `export ` prefix, a trailing
190
+ * `#` comment on an unquoted value, and the LAST assignment winning when the
191
+ * key repeats. Quotes are stripped only when they PAIR, so an unbalanced
192
+ * quote is left intact rather than half-removed.
193
+ *
194
+ * The first cut of this reader hand-rolled a narrower regex and inherited
195
+ * none of that, even though the repo had already been bitten by the `export `
196
+ * form on this very key — see `scripts/worktree-delete.test.ts:319`.
197
+ * internal / internal.
198
+ *
199
+ * `key` is always a literal from the call sites, never user input, so
200
+ * interpolating it into the pattern is safe.
201
+ */
202
+ export function extractEnvValue(contents, key) {
203
+ const re = new RegExp(`^[ \\t]*(?:export[ \\t]+)?${key}[ \\t]*=[ \\t]*(.*)$`, 'gm');
204
+ let raw;
205
+ for (const m of contents.matchAll(re))
206
+ raw = m[1];
207
+ if (raw === undefined)
208
+ return undefined;
209
+ let value = raw.trim();
210
+ const quote = value[0];
211
+ const isQuote = quote === '"' || quote === "'";
212
+ if (isQuote && value.length > 1 && value.endsWith(quote)) {
213
+ value = value.slice(1, -1);
214
+ }
215
+ else {
216
+ value = (value.split('#')[0] ?? '').trim();
217
+ }
218
+ return value;
219
+ }
220
+ /**
221
+ * Resolve a backender origin across the env files in precedence order, given
222
+ * their CONTENTS (`undefined` for a file that does not exist). Pure, so the
223
+ * precedence rule is unit-testable — the file I/O stays in `cli.ts`.
224
+ *
225
+ * **The first file that CONTAINS the key decides, even if its value is
226
+ * unusable.** That matches dotenv and `devTlsFromBackenderEnv`, which both
227
+ * fall through only on an ABSENT key. The first cut fell through on absent
228
+ * OR unusable, which let `.env.worktree` and `.env` disagree: the backender
229
+ * would use the higher-precedence value while the CLI silently resolved the
230
+ * lower one. Two answers for one key is exactly what reading these files in
231
+ * a shared order exists to prevent. Falling back to the preset is the safe
232
+ * direction; falling back to a different file is not. internal.
233
+ */
234
+ export function resolveOriginFromEnvFiles(key, files) {
235
+ for (const contents of files) {
236
+ if (contents === undefined)
237
+ continue;
238
+ const raw = extractEnvValue(contents, key);
239
+ if (raw === undefined)
240
+ continue;
241
+ return parseLocalBackenderOrigin(raw);
242
+ }
243
+ return undefined;
244
+ }
245
+ export const LOCAL_HTTP = {
246
+ environment: 'local',
247
+ apiUrl: 'http://localhost:8080',
248
+ authUrl: 'http://localhost:3021',
249
+ clientUrl: 'http://localhost:3020',
250
+ oauthClientId: '2',
251
+ };
252
+ export const LOCAL_HTTPS = {
253
+ environment: 'local',
254
+ // internal D14: TLS dev mode mirrors the prod parent-domain topology
255
+ // (`*.levr.test` is the dev counterpart of `*.levr.now` / `*.levr.one`).
256
+ // The mkcert cert generated by scripts/dev-setup-tls.sh covers these
257
+ // hostnames, /etc/hosts entries are written by the same script, and the
258
+ // SPA's `runtime-config.ts` falls back to the same triple. Keeping the
259
+ // names consistent end-to-end means cookies set with `Domain=.levr.test`
260
+ // travel to all three subdomains the same way they do in prod.
261
+ apiUrl: 'https://api.levr.test:8080',
262
+ authUrl: 'https://auth.levr.test:3021',
263
+ clientUrl: 'https://ai.levr.test:3020',
264
+ oauthClientId: '2',
265
+ };
266
+ /** Env files the backender reads, in its own precedence order. */
267
+ const BACKENDER_ENV_FILES = ['.env.worktree', '.env'];
268
+ /**
269
+ * The checkout a reader belongs to: the nearest ancestor of `start` with an
270
+ * `apps/backender` env file, or undefined outside any checkout (e.g. the
271
+ * published CLI run in an unrelated project).
272
+ *
273
+ * Walks up like `devTlsFromBackenderEnv`, so a reader started from an app
274
+ * subdirectory still finds its checkout. The stdio MCP servers are started
275
+ * from the checkout root (`./plugins/...` in `.mcp.json`) and the hooks from
276
+ * `$CLAUDE_PROJECT_DIR`, so for them `start` IS the session's checkout.
277
+ */
278
+ export function findLocalCheckoutRoot(start) {
279
+ let dir = path.resolve(start);
280
+ for (let i = 0; i < 10; i++) {
281
+ const hasEnv = BACKENDER_ENV_FILES.some((name) => fs.existsSync(path.join(dir, 'apps', 'backender', name)));
282
+ if (hasEnv)
283
+ return dir;
284
+ const parent = path.dirname(dir);
285
+ if (parent === dir)
286
+ break;
287
+ dir = parent;
288
+ }
289
+ return undefined;
290
+ }
291
+ /**
292
+ * Resolve the `local` environment for the checkout containing `start`.
293
+ *
294
+ * `local` means "the backend of the checkout I am working in". `tq:env local`
295
+ * still writes the URLs it resolved into the machine-global
296
+ * `~/.tq/config.json` (older readers and the published CLI read them), but
297
+ * every reader in this package re-resolves `local` HERE, against its own
298
+ * checkout, so running `tq:env local` in one worktree no longer re-points the
299
+ * sessions of every other checkout on the machine. internal.
300
+ *
301
+ * Per checkout:
302
+ * - all three URLs come from `apps/backender`'s env (`API_BASE_URL`,
303
+ * `AUTH_URL`, `CLIENT_APP_URL`), which `worktree-add.sh` writes together
304
+ * when it allocates a worktree's port block — resolving only the API left
305
+ * `tq:login` opening another checkout's auth-web;
306
+ * - `.env.worktree` before `.env`, the order `apps/backender/src/env.ts`
307
+ * loads them, and the first file that HAS a key decides
308
+ * (`resolveOriginFromEnvFiles`);
309
+ * - only a bare origin is accepted (`parseLocalBackenderOrigin`): the main
310
+ * checkout under DEV_TLS carries the SPA's `/api` proxy URL there, which
311
+ * must fall back to the preset, not be dialled (internal);
312
+ * - otherwise the local preset, HTTPS when this checkout runs DEV_TLS.
313
+ *
314
+ * This is deliberately STRICTER than `scripts/setup-mcp.ts`'s
315
+ * `resolveLocalLevrUrl`, which takes any `https?://` value: the levr MCP
316
+ * endpoint is legitimately reached THROUGH the SPA proxy, so it wants the
317
+ * `/api` suffix this must reject. Not drift to reconcile — "fixing" it
318
+ * reintroduces internal. internal.
319
+ *
320
+ * Returns undefined outside a checkout, so the caller keeps the stored URLs.
321
+ */
322
+ export function resolveLocalCheckout(start = process.cwd()) {
323
+ const root = findLocalCheckoutRoot(start);
324
+ if (!root)
325
+ return undefined;
326
+ // Per file, so one unreadable file does not discard the other — the
327
+ // backender would still read it.
328
+ const files = BACKENDER_ENV_FILES.map((name) => {
329
+ const envPath = path.join(root, 'apps', 'backender', name);
330
+ try {
331
+ return fs.existsSync(envPath)
332
+ ? fs.readFileSync(envPath, 'utf8')
333
+ : undefined;
334
+ }
335
+ catch {
336
+ return undefined;
337
+ }
338
+ });
339
+ const preset = checkoutUsesTls(files) ? LOCAL_HTTPS : LOCAL_HTTP;
340
+ return {
341
+ root,
342
+ apiUrl: resolveOriginFromEnvFiles('API_BASE_URL', files) ?? preset.apiUrl,
343
+ authUrl: resolveOriginFromEnvFiles('AUTH_URL', files) ?? preset.authUrl,
344
+ clientUrl: resolveOriginFromEnvFiles('CLIENT_APP_URL', files) ?? preset.clientUrl,
345
+ };
346
+ }
347
+ /**
348
+ * `isLocalTlsMode()` for an explicit checkout's env files rather than a cwd
349
+ * walk: tests first, then the `DEV_TLS` env var, then the first file that
350
+ * sets `DEV_TLS`. Same order, same parser.
351
+ */
352
+ function checkoutUsesTls(files) {
353
+ if (isTestEnv())
354
+ return false;
355
+ if (process.env.DEV_TLS === 'true')
356
+ return true;
357
+ if (process.env.DEV_TLS === 'false')
358
+ return false;
359
+ for (const contents of files) {
360
+ if (contents === undefined)
361
+ continue;
362
+ const parsed = parseDevTls(contents);
363
+ if (parsed !== undefined)
364
+ return parsed;
365
+ }
366
+ return false;
367
+ }
368
+ //# sourceMappingURL=local-env.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-env.js","sourceRoot":"","sources":["../src/local-env.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=local-env.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-env.test.d.ts","sourceRoot":"","sources":["../src/local-env.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,138 @@
1
+ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
2
+ import * as fs from 'fs';
3
+ import * as path from 'path';
4
+ import * as os from 'os';
5
+ const state = vi.hoisted(() => ({ tmpDir: '' }));
6
+ // token-store's TQ_DIR is derived from os.homedir() at import time.
7
+ vi.mock('os', async (importOriginal) => {
8
+ const original = await importOriginal();
9
+ return { ...original, homedir: () => state.tmpDir };
10
+ });
11
+ import { withNonTestEnv } from './test-utils.js';
12
+ let findLocalCheckoutRoot;
13
+ let resolveLocalCheckout;
14
+ let loadConfig;
15
+ let writeConfig;
16
+ let PRESETS;
17
+ let getCurrentApiUrl;
18
+ /** A fake checkout: `<root>/apps/backender/<file>` for each entry. */
19
+ function makeCheckout(name, files) {
20
+ const root = path.join(state.tmpDir, name);
21
+ const dir = path.join(root, 'apps', 'backender');
22
+ fs.mkdirSync(dir, { recursive: true });
23
+ for (const [file, contents] of Object.entries(files)) {
24
+ fs.writeFileSync(path.join(dir, file), contents);
25
+ }
26
+ return root;
27
+ }
28
+ const WORKTREE_ENV = 'API_BASE_URL=http://localhost:8380\n' +
29
+ 'AUTH_URL=http://localhost:3321\n' +
30
+ 'CLIENT_APP_URL=http://localhost:3320\n';
31
+ beforeEach(async () => {
32
+ state.tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'tq-local-env-'));
33
+ delete process.env.TQ_BACKEND_URL;
34
+ vi.resetModules();
35
+ ({ findLocalCheckoutRoot, resolveLocalCheckout } = await import('./local-env.js'));
36
+ ({ loadConfig, writeConfig, PRESETS } = await import('./config.js'));
37
+ ({ getCurrentApiUrl } = await import('./token-store.js'));
38
+ });
39
+ afterEach(() => {
40
+ vi.restoreAllMocks();
41
+ delete process.env.TQ_BACKEND_URL;
42
+ fs.rmSync(state.tmpDir, { recursive: true, force: true });
43
+ });
44
+ describe('findLocalCheckoutRoot', () => {
45
+ it('walks up from a subdirectory to the checkout', () => {
46
+ const root = makeCheckout('wt', { '.env': WORKTREE_ENV });
47
+ const sub = path.join(root, 'plugins', 'qinetic-mcp');
48
+ fs.mkdirSync(sub, { recursive: true });
49
+ expect(findLocalCheckoutRoot(sub)).toBe(root);
50
+ });
51
+ it('is undefined outside any checkout', () => {
52
+ const elsewhere = path.join(state.tmpDir, 'some-project');
53
+ fs.mkdirSync(elsewhere, { recursive: true });
54
+ expect(findLocalCheckoutRoot(elsewhere)).toBeUndefined();
55
+ });
56
+ });
57
+ describe('resolveLocalCheckout', () => {
58
+ it("reads all three URLs from the checkout's backender env", () => {
59
+ const root = makeCheckout('wt', { '.env': WORKTREE_ENV });
60
+ expect(resolveLocalCheckout(root)).toEqual({
61
+ root,
62
+ apiUrl: 'http://localhost:8380',
63
+ authUrl: 'http://localhost:3321',
64
+ clientUrl: 'http://localhost:3320',
65
+ });
66
+ });
67
+ it('falls back to the local preset when the env names no origin', () => {
68
+ const root = makeCheckout('main', { '.env': 'DB_DATABASE=tqaidb\n' });
69
+ const local = resolveLocalCheckout(root);
70
+ expect(local?.apiUrl).toBe('http://localhost:8080');
71
+ expect(local?.authUrl).toBe('http://localhost:3021');
72
+ expect(local?.clientUrl).toBe('http://localhost:3020');
73
+ });
74
+ it("rejects the SPA's /api proxy URL and uses the preset (internal)", () => {
75
+ const root = makeCheckout('main', {
76
+ '.env': 'API_BASE_URL=https://ai.levr.test:3020/api\n',
77
+ });
78
+ expect(resolveLocalCheckout(root)?.apiUrl).toBe('http://localhost:8080');
79
+ });
80
+ it('lets .env.worktree outrank .env, like the backender', () => {
81
+ const root = makeCheckout('wt', {
82
+ '.env.worktree': 'API_BASE_URL=http://localhost:9180\n',
83
+ '.env': WORKTREE_ENV,
84
+ });
85
+ expect(resolveLocalCheckout(root)?.apiUrl).toBe('http://localhost:9180');
86
+ });
87
+ it('is undefined outside any checkout', () => {
88
+ expect(resolveLocalCheckout(state.tmpDir)).toBeUndefined();
89
+ });
90
+ });
91
+ // The internal acceptance case: ONE machine-global ~/.tq/config.json, written
92
+ // by `tq:env local` in a worktree, read from two different checkouts.
93
+ describe('one shared `local` config, two checkouts', () => {
94
+ let main;
95
+ let worktree;
96
+ beforeEach(() => {
97
+ main = makeCheckout('main', { '.env': 'DB_DATABASE=tqaidb\n' });
98
+ worktree = makeCheckout('worktree', { '.env': WORKTREE_ENV });
99
+ // What `tq:env local` run in the worktree writes.
100
+ writeConfig({
101
+ environment: 'local',
102
+ apiUrl: 'http://localhost:8380',
103
+ authUrl: 'http://localhost:3321',
104
+ clientUrl: 'http://localhost:3320',
105
+ oauthClientId: '2',
106
+ });
107
+ });
108
+ const from = (cwd, fn) => {
109
+ vi.spyOn(process, 'cwd').mockReturnValue(cwd);
110
+ return withNonTestEnv(fn);
111
+ };
112
+ it('loadConfig resolves each checkout to its own backend', () => {
113
+ expect(from(main, () => loadConfig()).apiUrl).toBe('http://localhost:8080');
114
+ expect(from(main, () => loadConfig()).authUrl).toBe('http://localhost:3021');
115
+ expect(from(worktree, () => loadConfig()).apiUrl).toBe('http://localhost:8380');
116
+ });
117
+ it('getCurrentApiUrl agrees, so tokens are looked up per checkout', () => {
118
+ expect(from(main, () => getCurrentApiUrl())).toBe('http://localhost:8080');
119
+ expect(from(worktree, () => getCurrentApiUrl())).toBe('http://localhost:8380');
120
+ });
121
+ it('keeps the stored URLs outside any checkout', () => {
122
+ const elsewhere = path.join(state.tmpDir, 'some-project');
123
+ fs.mkdirSync(elsewhere, { recursive: true });
124
+ expect(from(elsewhere, () => loadConfig()).apiUrl).toBe('http://localhost:8380');
125
+ expect(from(elsewhere, () => getCurrentApiUrl())).toBe('http://localhost:8380');
126
+ });
127
+ it('TQ_BACKEND_URL still overrides both', () => {
128
+ process.env.TQ_BACKEND_URL = 'http://localhost:8380';
129
+ expect(from(main, () => loadConfig()).apiUrl).toBe('http://localhost:8380');
130
+ expect(from(main, () => getCurrentApiUrl())).toBe('http://localhost:8380');
131
+ });
132
+ it('staging stays global: every checkout follows it', () => {
133
+ writeConfig(PRESETS.staging);
134
+ expect(from(main, () => loadConfig()).apiUrl).toBe('https://api.levr.now');
135
+ expect(from(worktree, () => getCurrentApiUrl())).toBe('https://api.levr.now');
136
+ });
137
+ });
138
+ //# sourceMappingURL=local-env.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-env.test.js","sourceRoot":"","sources":["../src/local-env.test.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,31 @@
3
3
  * Implements authorization code flow with PKCE (RFC 7636)
4
4
  */
5
5
  import type { OAuthConfig, StoredTokens } from './types.js';
6
+ /**
7
+ * An isolated token store (internal D15.12, R3 C8 + C13).
8
+ *
9
+ * When an `OAuthClient` is given one, it is the ONLY place the client reads
10
+ * or writes tokens: the shared `~/.tq` store (token map, backup, refresh lock
11
+ * and workspace file) is never read, locked, refreshed from, restored or
12
+ * written. Used by tools that hold a narrowly scoped token of their own (the
13
+ * demo-video publish token), which must never replace or rotate the
14
+ * operator's everyday Levr login.
15
+ */
16
+ export interface OAuthTokenStore {
17
+ /** The stored tokens, or null when there are none usable. */
18
+ load(): StoredTokens | null;
19
+ save(tokens: StoredTokens): void;
20
+ clear(): void;
21
+ }
22
+ /** `OAuthClient` constructor options. */
23
+ export type OAuthClientOptions = Partial<OAuthConfig> & {
24
+ clientId: string;
25
+ /**
26
+ * Optional isolated token store. Absent: today's behaviour, the shared
27
+ * `~/.tq` store. Present: see `OAuthTokenStore`.
28
+ */
29
+ tokenStore?: OAuthTokenStore;
30
+ };
6
31
  export declare class OAuthClient {
7
32
  private config;
8
33
  private accessToken;
@@ -23,13 +48,17 @@ export declare class OAuthClient {
23
48
  * request to fail with invalid_grant (token already revoked by first).
24
49
  */
25
50
  private refreshPromise;
26
- constructor(config: Partial<OAuthConfig> & {
27
- clientId: string;
28
- });
51
+ /** The isolated token store, when the caller supplied one (D15.12). */
52
+ private readonly tokenStore;
53
+ constructor(options: OAuthClientOptions);
29
54
  /**
30
55
  * Load tokens from persistent storage
31
56
  */
32
57
  private loadStoredTokens;
58
+ /**
59
+ * Load tokens from the isolated store only (D15.12).
60
+ */
61
+ private loadIsolatedTokens;
33
62
  /**
34
63
  * Set tokens from external storage (used during initialization)
35
64
  */
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-client.d.ts","sourceRoot":"","sources":["../src/oauth-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH,OAAO,KAAK,EAEV,WAAW,EACX,YAAY,EAEb,MAAM,YAAY,CAAC;AAYpB,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,0BAA0B,CAAa;IAC/C;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAAkB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,cAAc,CAA8B;gBAExC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE;IAkB/D;;OAEG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQhD;;;OAGG;IACH,OAAO,CAAC,YAAY;IAapB;;OAEG;YACW,eAAe;IAkF7B;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyChC;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAkFtC;;OAEG;YACW,YAAY;IAgC1B;;;;;;;;;;;;;;OAcG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC9B;;;;OAIG;YACW,eAAe;IA+C7B;;;OAGG;YACW,eAAe;IAyE7B;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS;IA0BjB;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAoBvC;;OAEG;IACH,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAInC;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;;;;OAQG;IACG,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAY1C;;;OAGG;IACH,WAAW,IAAI,IAAI;IAUnB;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,eAAe,IAAI,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;OAEG;IACH,cAAc,CAAC,aAAa,GAAE,MAAU,GAAG,OAAO;IAMlD;;;;OAIG;IACH,iBAAiB,IAAI,OAAO;IAI5B;;OAEG;IACH,YAAY,IAAI,IAAI;CAGrB"}
1
+ {"version":3,"file":"oauth-client.d.ts","sourceRoot":"","sources":["../src/oauth-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH,OAAO,KAAK,EAEV,WAAW,EACX,YAAY,EAEb,MAAM,YAAY,CAAC;AAYpB;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC9B,6DAA6D;IAC7D,IAAI,IAAI,YAAY,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IACjC,KAAK,IAAI,IAAI,CAAC;CACf;AAED,yCAAyC;AACzC,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,0BAA0B,CAAa;IAC/C;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAAkB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,cAAc,CAA8B;IACpD,uEAAuE;IACvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;gBAExC,OAAO,EAAE,kBAAkB;IAuCvC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQhD;;;OAGG;IACH,OAAO,CAAC,YAAY;IAapB;;OAEG;YACW,eAAe;IAkF7B;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyChC;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAkFtC;;OAEG;YACW,YAAY;IAgC1B;;;;;;;;;;;;;;OAcG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD9B;;;;OAIG;YACW,eAAe;IA+C7B;;;OAGG;YACW,eAAe;IA6E7B;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS;IAqCjB;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAoBvC;;OAEG;IACH,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAInC;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;;;;OAQG;IACG,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAY1C;;;OAGG;IACH,WAAW,IAAI,IAAI;IAenB;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,eAAe,IAAI,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;OAEG;IACH,cAAc,CAAC,aAAa,GAAE,MAAU,GAAG,OAAO;IAMlD;;;;OAIG;IACH,iBAAiB,IAAI,OAAO;IAI5B;;OAEG;IACH,YAAY,IAAI,IAAI;CAOrB"}