layerbase 1.2.0 → 1.2.1

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.
@@ -18,13 +18,20 @@ export function Login({ flags }) {
18
18
  });
19
19
  setPhase({ kind: 'finishing' });
20
20
  // Save the token first so whoami() can read it, then enrich with the
21
- // cloud API key (best-effort, mirrors how desktop backfills it).
21
+ // cloud API key (best-effort, mirrors how desktop backfills it). The
22
+ // key MUST land in `apiKey`, the one slot loadStoredApiKey reads: every
23
+ // mutation (cloud create/delete/branch) is cloud /v1-only and refuses
24
+ // to run on a browser JWT alone.
22
25
  await saveCredentials({ apiUrl, token });
23
26
  let email = '';
24
27
  try {
25
28
  const me = await whoami();
26
29
  email = me.user.email;
27
- await saveCredentials({ apiUrl, token, cloudApiKey: me.cloudApiKey });
30
+ await saveCredentials({
31
+ apiUrl,
32
+ token,
33
+ ...(me.cloudApiKey ? { apiKey: me.cloudApiKey } : {}),
34
+ });
28
35
  }
29
36
  catch {
30
37
  // Token is already saved; enrichment is non-fatal.
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.tsx"],"names":[],"mappings":"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"}
@@ -29,12 +29,17 @@ export async function clearCredentials() {
29
29
  export function credentialsPath() {
30
30
  return CREDENTIALS_FILE;
31
31
  }
32
- // The stored personal `sk_` key, if a headless `login --api-key` saved one.
33
- // The env var and the --api-key flag take precedence over this (see
32
+ // The stored `sk_` key from either login path, with a fallback to the legacy
33
+ // `cloudApiKey` slot so a credentials file written by <= 1.2.0's browser login
34
+ // keeps working. Pure so the fallback is unit-testable without touching disk.
35
+ export function pickStoredApiKey(credentials) {
36
+ return credentials?.apiKey || credentials?.cloudApiKey || null;
37
+ }
38
+ // The stored `sk_` key, if either `layerbase login` or `login --api-key` saved
39
+ // one. The env var and the --api-key flag take precedence over this (see
34
40
  // resolveApiKey in cloud-api), so this is only the lowest-priority source.
35
41
  export async function loadStoredApiKey() {
36
- const credentials = await loadCredentials();
37
- return credentials?.apiKey ?? null;
42
+ return pickStoredApiKey(await loadCredentials());
38
43
  }
39
44
  // Persist a personal API key without a browser login (CI/agents). Preserves any
40
45
  // existing JWT/apiUrl so a user who logged in interactively and then adds a key
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAExE,+EAA+E;AAC/E,gFAAgF;AAChF,8CAA8C;AAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAA;AACpD,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAA;AAe7D,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA8B;IAE9B,MAAM,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IACzD,MAAM,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;QACtE,IAAI,EAAE,KAAK;KACZ,CAAC,CAAA;IACF,6EAA6E;IAC7E,MAAM,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAsB,CAAA;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,EAAE,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AAC7C,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED,4EAA4E;AAC5E,oEAAoE;AACpE,2EAA2E;AAC3E,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,WAAW,GAAG,MAAM,eAAe,EAAE,CAAA;IAC3C,OAAO,WAAW,EAAE,MAAM,IAAI,IAAI,CAAA;AACpC,CAAC;AAED,gFAAgF;AAChF,gFAAgF;AAChF,cAAc;AACd,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAGhC;IACC,MAAM,QAAQ,GAAG,MAAM,eAAe,EAAE,CAAA;IACxC,MAAM,eAAe,CAAC;QACpB,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;QACnB,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM;QAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAExE,+EAA+E;AAC/E,gFAAgF;AAChF,8CAA8C;AAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAA;AACpD,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAA;AAmB7D,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA8B;IAE9B,MAAM,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IACzD,MAAM,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;QACtE,IAAI,EAAE,KAAK;KACZ,CAAC,CAAA;IACF,6EAA6E;IAC7E,MAAM,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAsB,CAAA;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,EAAE,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AAC7C,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED,6EAA6E;AAC7E,+EAA+E;AAC/E,8EAA8E;AAC9E,MAAM,UAAU,gBAAgB,CAC9B,WAAqC;IAErC,OAAO,WAAW,EAAE,MAAM,IAAI,WAAW,EAAE,WAAW,IAAI,IAAI,CAAA;AAChE,CAAC;AAED,+EAA+E;AAC/E,yEAAyE;AACzE,2EAA2E;AAC3E,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,OAAO,gBAAgB,CAAC,MAAM,eAAe,EAAE,CAAC,CAAA;AAClD,CAAC;AAED,gFAAgF;AAChF,gFAAgF;AAChF,cAAc;AACd,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAGhC;IACC,MAAM,QAAQ,GAAG,MAAM,eAAe,EAAE,CAAA;IACxC,MAAM,eAAe,CAAC;QACpB,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;QACnB,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM;QAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "layerbase",
3
- "version": "1.2.0",
3
+ "version": "1.2.1",
4
4
  "description": "Layerbase cloud CLI: connect to your managed databases without leaking the connection string into shell history.",
5
5
  "type": "module",
6
6
  "bin": {