@barekey/cli 0.5.0 → 0.5.1

package/dist/commands/auth.js

@@ -35,6 +35,10 @@ function resolveVerificationUri(baseUrl, verificationUri) {
     }
     return verificationUri;
 }
+function resolveDisplayName(input) {
+    const displayName = input.displayName?.trim();
+    return displayName && displayName.length > 0 ? displayName : input.clerkUserId;
+}
 async function runLogin(options) {
     const baseUrl = await resolveBaseUrl(options.baseUrl);
     intro("Barekey CLI login");
@@ -89,6 +93,8 @@ async function runLogin(options) {
                 orgId: poll.orgId,
                 orgSlug: poll.orgSlug,
                 clerkUserId: poll.clerkUserId,
+                displayName: poll.displayName,
+                email: poll.email,
             });
             const sessionId = buildSessionId(baseUrl, refreshed.clerkUserId);
             await saveCredentials(sessionId, {
@@ -108,7 +114,7 @@ async function runLogin(options) {
             });
             pollSpinner.stop("Login approved");
             pollActive = false;
-            outro(`Logged in as ${pc.bold(refreshed.clerkUserId)}.`);
+            outro(`Signed in as ${pc.bold(resolveDisplayName(refreshed))}.`);
             return;
         }
         pollSpinner.stop("Timed out");
@@ -152,9 +158,10 @@ async function runWhoami(options) {
         toJsonOutput(true, session);
         return;
     }
-    console.log(`${pc.bold("User")}: ${session.clerkUserId}`);
-    console.log(`${pc.bold("Current org")}: ${session.orgSlug}`);
-    console.log(`${pc.bold("Source")}: ${session.source}`);
+    console.log(resolveDisplayName(session));
+    if (session.email !== null) {
+        console.log(session.email);
+    }
 }
 export function registerAuthCommands(program) {
     const auth = program.command("auth").description("Authentication commands");

package/dist/commands/billing.js

@@ -5,12 +5,9 @@ import { getJson, postJson } from "../http.js";
 import { promptForOrganizationSlug } from "./target-prompts.js";
 async function runBillingCatalog(options) {
     const local = await requireLocalSession();
-    const authProvider = createCliAuthProvider();
-    const accessToken = await authProvider.getAccessToken();
     const response = await getJson({
         baseUrl: local.baseUrl,
         path: "/v1/cli/billing/catalog",
-        accessToken,
         schema: BillingCatalogResponseSchema,
     });
     if (options.json) {

package/dist/contracts/index.d.ts

@@ -51,6 +51,8 @@ export declare const ErrorEnvelopeSchema: Schema.Struct<{
 }>;
 export declare const CliSessionResponseSchema: Schema.Struct<{
     clerkUserId: typeof Schema.String;
+    displayName: Schema.NullOr<typeof Schema.String>;
+    email: Schema.NullOr<typeof Schema.String>;
     orgId: typeof Schema.String;
     orgSlug: typeof Schema.String;
     source: Schema.Literal<["clerk", "cli"]>;
@@ -79,6 +81,8 @@ export declare const DevicePollApprovedSchema: Schema.Struct<{
     orgId: typeof Schema.String;
     orgSlug: typeof Schema.String;
     clerkUserId: typeof Schema.String;
+    displayName: Schema.NullOr<typeof Schema.String>;
+    email: Schema.NullOr<typeof Schema.String>;
     requestId: Schema.optional<typeof Schema.String>;
 }>;
 export declare const DevicePollResponseSchema: Schema.Union<[Schema.Struct<{
@@ -95,6 +99,8 @@ export declare const DevicePollResponseSchema: Schema.Union<[Schema.Struct<{
     orgId: typeof Schema.String;
     orgSlug: typeof Schema.String;
     clerkUserId: typeof Schema.String;
+    displayName: Schema.NullOr<typeof Schema.String>;
+    email: Schema.NullOr<typeof Schema.String>;
     requestId: Schema.optional<typeof Schema.String>;
 }>]>;
 export declare const RefreshResponseSchema: Schema.Struct<{
@@ -105,6 +111,8 @@ export declare const RefreshResponseSchema: Schema.Struct<{
     orgId: typeof Schema.String;
     orgSlug: typeof Schema.String;
     clerkUserId: typeof Schema.String;
+    displayName: Schema.NullOr<typeof Schema.String>;
+    email: Schema.NullOr<typeof Schema.String>;
     requestId: Schema.optional<typeof Schema.String>;
 }>;
 export declare const EnvDecisionSchema: Schema.Struct<{

package/dist/contracts/index.js

@@ -53,6 +53,8 @@ export const ErrorEnvelopeSchema = Schema.Struct({
 });
 export const CliSessionResponseSchema = Schema.Struct({
     clerkUserId: Schema.String,
+    displayName: Schema.NullOr(Schema.String),
+    email: Schema.NullOr(Schema.String),
     orgId: Schema.String,
     orgSlug: Schema.String,
     source: Schema.Literal("clerk", "cli"),
@@ -81,6 +83,8 @@ export const DevicePollApprovedSchema = Schema.Struct({
     orgId: Schema.String,
     orgSlug: Schema.String,
     clerkUserId: Schema.String,
+    displayName: Schema.NullOr(Schema.String),
+    email: Schema.NullOr(Schema.String),
     requestId: Schema.optional(Schema.String),
 });
 export const DevicePollResponseSchema = Schema.Union(DevicePollPendingSchema, DevicePollApprovedSchema);
@@ -92,6 +96,8 @@ export const RefreshResponseSchema = Schema.Struct({
     orgId: Schema.String,
     orgSlug: Schema.String,
     clerkUserId: Schema.String,
+    displayName: Schema.NullOr(Schema.String),
+    email: Schema.NullOr(Schema.String),
     requestId: Schema.optional(Schema.String),
 });
 export const EnvDecisionSchema = Schema.Struct({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barekey/cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Barekey command line interface",
   "type": "module",
   "bin": {

package/src/commands/auth.ts

@@ -57,6 +57,14 @@ function resolveVerificationUri(baseUrl: string, verificationUri: string): strin
   return verificationUri;
 }
 
+function resolveDisplayName(input: {
+  displayName: string | null;
+  clerkUserId: string;
+}): string {
+  const displayName = input.displayName?.trim();
+  return displayName && displayName.length > 0 ? displayName : input.clerkUserId;
+}
+
 async function runLogin(options: { baseUrl?: string }): Promise<void> {
   const baseUrl = await resolveBaseUrl(options.baseUrl);
   intro("Barekey CLI login");
@@ -117,6 +125,8 @@ async function runLogin(options: { baseUrl?: string }): Promise<void> {
         orgId: poll.orgId,
         orgSlug: poll.orgSlug,
         clerkUserId: poll.clerkUserId,
+        displayName: poll.displayName,
+        email: poll.email,
       });
       const sessionId = buildSessionId(baseUrl, refreshed.clerkUserId);
 
@@ -138,7 +148,7 @@ async function runLogin(options: { baseUrl?: string }): Promise<void> {
 
       pollSpinner.stop("Login approved");
       pollActive = false;
-      outro(`Logged in as ${pc.bold(refreshed.clerkUserId)}.`);
+      outro(`Signed in as ${pc.bold(resolveDisplayName(refreshed))}.`);
       return;
     }
 
@@ -186,9 +196,10 @@ async function runWhoami(options: { json?: boolean }): Promise<void> {
     return;
   }
 
-  console.log(`${pc.bold("User")}: ${session.clerkUserId}`);
-  console.log(`${pc.bold("Current org")}: ${session.orgSlug}`);
-  console.log(`${pc.bold("Source")}: ${session.source}`);
+  console.log(resolveDisplayName(session));
+  if (session.email !== null) {
+    console.log(session.email);
+  }
 }
 
 export function registerAuthCommands(program: Command): void {

package/src/commands/billing.ts

@@ -8,12 +8,9 @@ import { promptForOrganizationSlug } from "./target-prompts.js";
 
 async function runBillingCatalog(options: { json?: boolean }) {
   const local = await requireLocalSession();
-  const authProvider = createCliAuthProvider();
-  const accessToken = await authProvider.getAccessToken();
   const response = await getJson({
     baseUrl: local.baseUrl,
     path: "/v1/cli/billing/catalog",
-    accessToken,
     schema: BillingCatalogResponseSchema,
   });
 

package/src/contracts/index.ts

@@ -75,6 +75,8 @@ export const ErrorEnvelopeSchema = Schema.Struct({
 
 export const CliSessionResponseSchema = Schema.Struct({
   clerkUserId: Schema.String,
+  displayName: Schema.NullOr(Schema.String),
+  email: Schema.NullOr(Schema.String),
   orgId: Schema.String,
   orgSlug: Schema.String,
   source: Schema.Literal("clerk", "cli"),
@@ -106,6 +108,8 @@ export const DevicePollApprovedSchema = Schema.Struct({
   orgId: Schema.String,
   orgSlug: Schema.String,
   clerkUserId: Schema.String,
+  displayName: Schema.NullOr(Schema.String),
+  email: Schema.NullOr(Schema.String),
   requestId: Schema.optional(Schema.String),
 });
 
@@ -122,6 +126,8 @@ export const RefreshResponseSchema = Schema.Struct({
   orgId: Schema.String,
   orgSlug: Schema.String,
   clerkUserId: Schema.String,
+  displayName: Schema.NullOr(Schema.String),
+  email: Schema.NullOr(Schema.String),
   requestId: Schema.optional(Schema.String),
 });