@lizard-build/cli 4.0.48 → 4.0.49

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.
Files changed (15) hide show
  1. package/dist/commands/login.js +15 -12
  2. package/dist/commands/login.js.map +1 -1
  3. package/dist/commands/whoami.js +19 -9
  4. package/dist/commands/whoami.js.map +1 -1
  5. package/dist/lib/signin.d.ts +17 -2
  6. package/dist/lib/signin.js +21 -1
  7. package/dist/lib/signin.js.map +1 -1
  8. package/dist/lib/updater.d.ts +1 -1
  9. package/dist/lib/updater.js +1 -1
  10. package/package.json +1 -1
  11. package/src/commands/login.ts +16 -12
  12. package/src/commands/whoami.ts +20 -21
  13. package/src/lib/signin.ts +36 -3
  14. package/src/lib/updater.ts +1 -1
  15. package/test/unit/describe-me.test.ts +23 -0
package/dist/commands/login.js CHANGED
@@ -4,7 +4,7 @@ import { saveCredentials, jwtExpiryMs, envToken, openURL } from "../lib/auth.js"
4
4
  import { api, getBaseURL } from "../lib/api.js";
5
5
  import { getProjectLink } from "../lib/config.js";
6
6
  import { success, isJSONMode, printJSON } from "../lib/format.js";
7
- import { currentUser, fetchAuthProviders, pendingPayload, providerFlag, resumePending, signInInteractive, startSession, } from "../lib/signin.js";
7
+ import { currentUser, fetchAuthProviders, pendingPayload, providerFlag, resumePending, signInInteractive, startSession, describeMe, } from "../lib/signin.js";
8
8
  import { CREDITS_END, billingUrl, daysLeft, describeSubscription, usd } from "./billing.js";
9
9
  /** What the account still needs, from `GET /api/billing/subscription` (null when it could not be read). */
10
10
  export function accountState(sub) {
@@ -128,9 +128,9 @@ async function loginForAgent(flag) {
128
128
  const state = accountState(sub);
129
129
  printJSON({
130
130
  status: "complete",
131
- username: me.username,
132
- ...(me.email ? { email: me.email } : {}),
133
- ...(me.scoped ? { scoped: true } : {}),
131
+ ...(me.scoped
132
+ ? { scoped: true, scopes: me.scopes ?? [] }
133
+ : { username: me.username, ...(me.email ? { email: me.email } : {}) }),
134
134
  source,
135
135
  account: {
136
136
  state,
@@ -181,12 +181,12 @@ async function loginInteractive(flag) {
181
181
  p.intro(chalk.bold("Lizard CLI"));
182
182
  const me = await currentUser();
183
183
  if (me) {
184
- p.log.success(`Signed in as ${chalk.bold(me.username)}`);
184
+ p.log.success(`Signed in as ${chalk.bold(describeMe(me))}`);
185
185
  p.log.message(chalk.dim("To use another account: lizard logout, then lizard login."));
186
186
  }
187
187
  else if ((await resumePending()).kind === "complete") {
188
188
  const resumed = await api.get("/api/auth/me");
189
- p.log.success(`Signed in as ${chalk.bold(resumed.username)}`);
189
+ p.log.success(`Signed in as ${chalk.bold(describeMe(resumed))}`);
190
190
  }
191
191
  else {
192
192
  await signInInteractive(flag);
@@ -204,19 +204,22 @@ async function loginWithToken(token) {
204
204
  throw new Error("Invalid token");
205
205
  const user = (await res.json());
206
206
  const expMs = jwtExpiryMs(token);
207
+ // A scoped key's credentials keep no owner identity, even if an older platform sent it.
207
208
  saveCredentials({
208
209
  accessToken: token,
209
210
  expiresAt: expMs ? new Date(expMs).toISOString() : undefined,
210
- userId: user.id,
211
- username: user.username,
212
- email: user.email,
213
- avatarUrl: user.avatarUrl,
211
+ userId: user.scoped ? "" : user.id ?? "",
212
+ username: user.scoped ? "" : user.username ?? "",
213
+ email: user.scoped ? undefined : user.email ?? undefined,
214
+ avatarUrl: user.scoped ? undefined : user.avatarUrl,
214
215
  });
215
216
  if (isJSONMode()) {
216
- printJSON({ status: "complete", username: user.username });
217
+ printJSON(user.scoped
218
+ ? { status: "complete", scoped: true, scopes: user.scopes ?? [] }
219
+ : { status: "complete", username: user.username });
217
220
  }
218
221
  else {
219
- success(`Logged in as ${chalk.bold(user.username)}`);
222
+ success(`Logged in as ${chalk.bold(describeMe(user))}`);
220
223
  }
221
224
  }
222
225
  /**
package/dist/commands/login.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
package/dist/commands/whoami.js CHANGED
@@ -2,6 +2,7 @@ import chalk from "chalk";
2
2
  import { api } from "../lib/api.js";
3
3
  import { getProjectLink } from "../lib/config.js";
4
4
  import { isJSONMode, printJSON } from "../lib/format.js";
5
+ import { describeScope } from "../lib/signin.js";
5
6
  export function registerWhoami(program) {
6
7
  program
7
8
  .command("whoami")
@@ -17,20 +18,29 @@ export function registerWhoami(program) {
17
18
  workspaceName: link.workspaceName ?? null,
18
19
  }
19
20
  : null;
21
+ // A scoped key is handed to people who are not the account's members: it shows the
22
+ // projects and workspaces it reaches, never whose account it is. The platform no
23
+ // longer sends the owner for one; dropping it here covers an older platform too.
24
+ if (user.scoped) {
25
+ const scopes = user.scopes ?? [];
26
+ if (isJSONMode()) {
27
+ printJSON({ scoped: true, scopes, project });
28
+ return;
29
+ }
30
+ console.log(chalk.bold("Scoped API key") + chalk.dim(" (account details are not visible)"));
31
+ for (const sc of scopes)
32
+ console.log(chalk.dim(" ") + describeScope(sc));
33
+ if (project) {
34
+ const wsTag = project.workspaceName ? chalk.dim(` (${project.workspaceName})`) : "";
35
+ console.log(chalk.dim("Project: ") + (project.name || project.id) + wsTag + chalk.dim(" (linked here)"));
36
+ }
37
+ return;
38
+ }
20
39
  if (isJSONMode()) {
21
40
  printJSON({ ...user, project });
22
41
  return;
23
42
  }
24
43
  console.log(chalk.bold(user.username));
25
- if (user.scoped) {
26
- const n = user.scopes?.length ?? 0;
27
- console.log(chalk.dim("Key: ") +
28
- `scoped to ${n} ${n === 1 ? "resource" : "resources"}` +
29
- chalk.dim(" (account billing and settings are not visible)"));
30
- for (const sc of user.scopes ?? []) {
31
- console.log(chalk.dim(` ${sc.type} ${sc.id}`));
32
- }
33
- }
34
44
  if (user.hasGithubApp) {
35
45
  console.log(chalk.dim("GitHub App: connected"));
36
46
  }
package/dist/commands/whoami.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,yDAAyD,CAAC;SACtE,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,CAevB,cAAc,CAAC,CAAC;QAEnB,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI;YAClB,CAAC,CAAC;gBACE,EAAE,EAAE,IAAI,CAAC,SAAS;gBAClB,IAAI,EAAE,IAAI,CAAC,WAAW;gBACtB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;gBACrC,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;aAC1C;YACH,CAAC,CAAC,IAAI,CAAC;QAET,IAAI,UAAU,EAAE,EAAE,CAAC;YACjB,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAChC,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;YACnC,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;gBAChB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE;gBACtD,KAAK,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAC/D,CAAC;YACF,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;gBACnC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACpF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,0DAA0D,CAAC,CACtE,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"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"}
package/dist/lib/signin.d.ts CHANGED
@@ -17,12 +17,27 @@ export interface CheckResponse {
17
17
  avatarUrl?: string;
18
18
  };
19
19
  }
20
- export interface Me {
20
+ /** One project or workspace a scoped API key reaches, by name. */
21
+ export interface KeyScope {
22
+ type: "workspace" | "project";
21
23
  id: string;
22
- username: string;
24
+ name?: string | null;
25
+ workspaceId?: string | null;
26
+ workspaceName?: string | null;
27
+ }
28
+ export interface Me {
29
+ id?: string;
30
+ username?: string;
23
31
  email?: string | null;
24
32
  scoped?: boolean;
33
+ scopes?: KeyScope[];
25
34
  }
35
+ /** "Project X (workspace Y)" for one scope; the id when the name is unknown. */
36
+ export declare function describeScope(sc: KeyScope): string;
37
+ /** Who a login is, for "Signed in as ...": the username for an account, and the
38
+ * project/workspace for a scoped key -- never the account owner's name, even from an
39
+ * older platform that still sends it. */
40
+ export declare function describeMe(me: Me): string;
26
41
  export interface Pending {
27
42
  sessionId: string;
28
43
  sessionSecret: string;
package/dist/lib/signin.js CHANGED
@@ -8,6 +8,26 @@ const PROVIDER_LABEL = { github: "GitHub", google: "Google" };
8
8
  const SESSION_TTL_MS = 300_000;
9
9
  /** The platform allows 60 polls per session over its 5 minutes: one every 5 s. */
10
10
  const POLL_MS = 5_000;
11
+ /** "Project X (workspace Y)" for one scope; the id when the name is unknown. */
12
+ export function describeScope(sc) {
13
+ if (sc.type === "project") {
14
+ const ws = sc.workspaceName ? ` (workspace ${sc.workspaceName})` : "";
15
+ return `project ${sc.name || sc.id}${ws}`;
16
+ }
17
+ return `workspace ${sc.name || sc.id}`;
18
+ }
19
+ /** Who a login is, for "Signed in as ...": the username for an account, and the
20
+ * project/workspace for a scoped key -- never the account owner's name, even from an
21
+ * older platform that still sends it. */
22
+ export function describeMe(me) {
23
+ if (me.scoped) {
24
+ const scopes = me.scopes ?? [];
25
+ if (scopes.length === 0)
26
+ return "a scoped API key";
27
+ return `a key for ${scopes.map(describeScope).join(", ")}`;
28
+ }
29
+ return me.username ?? "unknown";
30
+ }
11
31
  /**
12
32
  * The page that approves a CLI session. With a provider it signs a signed-out
13
33
  * browser in with that method; without one it uses GitHub, as it always has.
@@ -243,7 +263,7 @@ export async function signInInteractive(flag) {
243
263
  saveSessionLogin({ accessToken: result.accessToken, user: result.user });
244
264
  spin.stop("Authorized");
245
265
  const me = await api.get("/api/auth/me");
246
- p.log.success(`Signed in as ${chalk.bold(me.username)}`);
266
+ p.log.success(`Signed in as ${chalk.bold(describeMe(me))}`);
247
267
  return me;
248
268
  }
249
269
  //# sourceMappingURL=signin.js.map
package/dist/lib/signin.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signin.js","sourceRoot":"","sources":["../../src/lib/signin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signin.js","sourceRoot":"","sources":["../../src/lib/signin.ts"],"names":[],"mappings":"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"}
package/dist/lib/updater.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const CURRENT_VERSION = "4.0.48";
1
+ export declare const CURRENT_VERSION = "4.0.49";
2
2
  /**
3
3
  * True when selfUpdate() has a release asset to swap in for this platform.
4
4
  * False on Windows: a running .exe can't be replaced in place, so the
package/dist/lib/updater.js CHANGED
@@ -4,7 +4,7 @@ import { Readable } from "node:stream";
4
4
  import { join, dirname } from "node:path";
5
5
  import os from "node:os";
6
6
  import { spawn } from "node:child_process";
7
- export const CURRENT_VERSION = "4.0.48";
7
+ export const CURRENT_VERSION = "4.0.49";
8
8
  const RELEASES_API = "https://api.github.com/repos/lizard-build/lizard-cli/releases/latest";
9
9
  const RELEASE_BASE = "https://github.com/lizard-build/lizard-cli/releases/latest/download";
10
10
  /** Minimum gap between background update checks. */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lizard-build/cli",
3
- "version": "4.0.48",
3
+ "version": "4.0.49",
4
4
  "description": "Lizard CLI — deploy apps, databases and sandboxes to Lizard (lizard.build) from your terminal or your coding agent. Detects Go, Node, Python, Rust, Ruby, PHP, Java and static sites; adds Managed Postgres, Managed Redis and Managed Object Storage in one command.",
5
5
  "type": "module",
6
6
  "bin": {
package/src/commands/login.ts CHANGED
@@ -14,6 +14,7 @@ import {
14
14
  signInInteractive,
15
15
  startSession,
16
16
  type AuthProvider,
17
+ describeMe,
17
18
  type Me,
18
19
  } from "../lib/signin.js";
19
20
  import { CREDITS_END, billingUrl, daysLeft, describeSubscription, usd, type Subscription } from "./billing.js";
@@ -173,9 +174,9 @@ async function loginForAgent(flag?: AuthProvider): Promise<void> {
173
174
  const state = accountState(sub);
174
175
  printJSON({
175
176
  status: "complete",
176
- username: me.username,
177
- ...(me.email ? { email: me.email } : {}),
178
- ...(me.scoped ? { scoped: true } : {}),
177
+ ...(me.scoped
178
+ ? { scoped: true, scopes: me.scopes ?? [] }
179
+ : { username: me.username, ...(me.email ? { email: me.email } : {}) }),
179
180
  source,
180
181
  account: {
181
182
  state,
@@ -231,11 +232,11 @@ async function loginInteractive(flag?: AuthProvider): Promise<void> {
231
232
 
232
233
  const me = await currentUser();
233
234
  if (me) {
234
- p.log.success(`Signed in as ${chalk.bold(me.username)}`);
235
+ p.log.success(`Signed in as ${chalk.bold(describeMe(me))}`);
235
236
  p.log.message(chalk.dim("To use another account: lizard logout, then lizard login."));
236
237
  } else if ((await resumePending()).kind === "complete") {
237
238
  const resumed = await api.get<Me>("/api/auth/me");
238
- p.log.success(`Signed in as ${chalk.bold(resumed.username)}`);
239
+ p.log.success(`Signed in as ${chalk.bold(describeMe(resumed))}`);
239
240
  } else {
240
241
  await signInInteractive(flag);
241
242
  }
@@ -252,20 +253,23 @@ async function loginWithToken(token: string): Promise<void> {
252
253
  headers: { Authorization: `Bearer ${token}` },
253
254
  });
254
255
  if (!res.ok) throw new Error("Invalid token");
255
- const user = (await res.json()) as any;
256
+ const user = (await res.json()) as Me & { avatarUrl?: string };
256
257
  const expMs = jwtExpiryMs(token);
258
+ // A scoped key's credentials keep no owner identity, even if an older platform sent it.
257
259
  saveCredentials({
258
260
  accessToken: token,
259
261
  expiresAt: expMs ? new Date(expMs).toISOString() : undefined,
260
- userId: user.id,
261
- username: user.username,
262
- email: user.email,
263
- avatarUrl: user.avatarUrl,
262
+ userId: user.scoped ? "" : user.id ?? "",
263
+ username: user.scoped ? "" : user.username ?? "",
264
+ email: user.scoped ? undefined : user.email ?? undefined,
265
+ avatarUrl: user.scoped ? undefined : user.avatarUrl,
264
266
  });
265
267
  if (isJSONMode()) {
266
- printJSON({ status: "complete", username: user.username });
268
+ printJSON(user.scoped
269
+ ? { status: "complete", scoped: true, scopes: user.scopes ?? [] }
270
+ : { status: "complete", username: user.username });
267
271
  } else {
268
- success(`Logged in as ${chalk.bold(user.username)}`);
272
+ success(`Logged in as ${chalk.bold(describeMe(user))}`);
269
273
  }
270
274
  }
271
275
 
package/src/commands/whoami.ts CHANGED
@@ -3,27 +3,19 @@ import { Command } from "commander";
3
3
  import { api } from "../lib/api.js";
4
4
  import { getProjectLink } from "../lib/config.js";
5
5
  import { isJSONMode, printJSON } from "../lib/format.js";
6
+ import { describeScope, type Me } from "../lib/signin.js";
6
7
 
7
8
  export function registerWhoami(program: Command) {
8
9
  program
9
10
  .command("whoami")
10
11
  .description("Show current user, active workspace, and linked project")
11
12
  .action(async () => {
12
- const user = await api.get<{
13
- id: string;
14
- username: string;
13
+ const user = await api.get<Me & {
15
14
  avatarUrl?: string;
16
15
  hasGithubApp?: boolean;
17
16
  activeWorkspaceId?: string | null;
18
17
  activeWorkspaceName?: string | null;
19
18
  defaultWorkspaceId?: string | null;
20
- // Present only when the caller is a SCOPED API key. The account's email,
21
- // balance and plan are withheld in that case — they belong to the account,
22
- // not to the key holder, and a scoped key is made to be handed to someone
23
- // else or injected into a sandbox. --json prints whatever the server sends,
24
- // so this is also what stops `whoami --json` from leaking them.
25
- scoped?: boolean;
26
- scopes?: Array<{ type: "workspace" | "project"; id: string }>;
27
19
  }>("/api/auth/me");
28
20
 
29
21
  const link = getProjectLink();
@@ -36,23 +28,30 @@ export function registerWhoami(program: Command) {
36
28
  }
37
29
  : null;
38
30
 
31
+ // A scoped key is handed to people who are not the account's members: it shows the
32
+ // projects and workspaces it reaches, never whose account it is. The platform no
33
+ // longer sends the owner for one; dropping it here covers an older platform too.
34
+ if (user.scoped) {
35
+ const scopes = user.scopes ?? [];
36
+ if (isJSONMode()) {
37
+ printJSON({ scoped: true, scopes, project });
38
+ return;
39
+ }
40
+ console.log(chalk.bold("Scoped API key") + chalk.dim(" (account details are not visible)"));
41
+ for (const sc of scopes) console.log(chalk.dim(" ") + describeScope(sc));
42
+ if (project) {
43
+ const wsTag = project.workspaceName ? chalk.dim(` (${project.workspaceName})`) : "";
44
+ console.log(chalk.dim("Project: ") + (project.name || project.id) + wsTag + chalk.dim(" (linked here)"));
45
+ }
46
+ return;
47
+ }
48
+
39
49
  if (isJSONMode()) {
40
50
  printJSON({ ...user, project });
41
51
  return;
42
52
  }
43
53
 
44
54
  console.log(chalk.bold(user.username));
45
- if (user.scoped) {
46
- const n = user.scopes?.length ?? 0;
47
- console.log(
48
- chalk.dim("Key: ") +
49
- `scoped to ${n} ${n === 1 ? "resource" : "resources"}` +
50
- chalk.dim(" (account billing and settings are not visible)"),
51
- );
52
- for (const sc of user.scopes ?? []) {
53
- console.log(chalk.dim(` ${sc.type} ${sc.id}`));
54
- }
55
- }
56
55
  if (user.hasGithubApp) {
57
56
  console.log(chalk.dim("GitHub App: connected"));
58
57
  }
package/src/lib/signin.ts CHANGED
@@ -48,11 +48,44 @@ export interface CheckResponse {
48
48
  };
49
49
  }
50
50
 
51
- export interface Me {
51
+ /** One project or workspace a scoped API key reaches, by name. */
52
+ export interface KeyScope {
53
+ type: "workspace" | "project";
52
54
  id: string;
53
- username: string;
55
+ name?: string | null;
56
+ workspaceId?: string | null;
57
+ workspaceName?: string | null;
58
+ }
59
+
60
+ export interface Me {
61
+ // Absent for a scoped API key: the platform never tells a scoped key whose account it
62
+ // is (it is handed to people who are not the account's members).
63
+ id?: string;
64
+ username?: string;
54
65
  email?: string | null;
55
66
  scoped?: boolean;
67
+ scopes?: KeyScope[];
68
+ }
69
+
70
+ /** "Project X (workspace Y)" for one scope; the id when the name is unknown. */
71
+ export function describeScope(sc: KeyScope): string {
72
+ if (sc.type === "project") {
73
+ const ws = sc.workspaceName ? ` (workspace ${sc.workspaceName})` : "";
74
+ return `project ${sc.name || sc.id}${ws}`;
75
+ }
76
+ return `workspace ${sc.name || sc.id}`;
77
+ }
78
+
79
+ /** Who a login is, for "Signed in as ...": the username for an account, and the
80
+ * project/workspace for a scoped key -- never the account owner's name, even from an
81
+ * older platform that still sends it. */
82
+ export function describeMe(me: Me): string {
83
+ if (me.scoped) {
84
+ const scopes = me.scopes ?? [];
85
+ if (scopes.length === 0) return "a scoped API key";
86
+ return `a key for ${scopes.map(describeScope).join(", ")}`;
87
+ }
88
+ return me.username ?? "unknown";
56
89
  }
57
90
 
58
91
  export interface Pending {
@@ -315,6 +348,6 @@ export async function signInInteractive(flag?: AuthProvider): Promise<Me> {
315
348
  saveSessionLogin({ accessToken: result.accessToken, user: result.user });
316
349
  spin.stop("Authorized");
317
350
  const me = await api.get<Me>("/api/auth/me");
318
- p.log.success(`Signed in as ${chalk.bold(me.username)}`);
351
+ p.log.success(`Signed in as ${chalk.bold(describeMe(me))}`);
319
352
  return me;
320
353
  }
package/src/lib/updater.ts CHANGED
@@ -5,7 +5,7 @@ import { join, dirname } from "node:path";
5
5
  import os from "node:os";
6
6
  import { spawn } from "node:child_process";
7
7
 
8
- export const CURRENT_VERSION = "4.0.48";
8
+ export const CURRENT_VERSION = "4.0.49";
9
9
  const RELEASES_API = "https://api.github.com/repos/lizard-build/lizard-cli/releases/latest";
10
10
  const RELEASE_BASE = "https://github.com/lizard-build/lizard-cli/releases/latest/download";
11
11
 
package/test/unit/describe-me.test.ts ADDED
@@ -0,0 +1,23 @@
1
+ import { describe, expect, it } from "vitest";
2
+ import { describeMe } from "../../src/lib/signin.js";
3
+
4
+ describe("describeMe", () => {
5
+ it("names an account by its username", () => {
6
+ expect(describeMe({ id: "u1", username: "alice" })).toBe("alice");
7
+ });
8
+
9
+ it("names a project-scoped key by its project and workspace, never the owner", () => {
10
+ const text = describeMe({
11
+ // An older platform still sent the owner for a scoped key.
12
+ id: "u1", username: "alice-the-owner", scoped: true,
13
+ scopes: [{ type: "project", id: "p1", name: "Shop", workspaceId: "w1", workspaceName: "Acme" }],
14
+ });
15
+ expect(text).toBe("a key for project Shop (workspace Acme)");
16
+ expect(text).not.toContain("alice");
17
+ });
18
+
19
+ it("names a workspace-scoped key by its workspace, falling back to the id", () => {
20
+ expect(describeMe({ scoped: true, scopes: [{ type: "workspace", id: "w1", name: "Acme" }, { type: "workspace", id: "w2" }] }))
21
+ .toBe("a key for workspace Acme, workspace w2");
22
+ });
23
+ });