fix(auth): display user info on login and status commands (#143)

BYK · web-flow · commit 7cb7cfe25706 · 2026-01-31T03:24:15.000Z
- Use user info from OAuth token response instead of calling /users/me/
  (which returns 403 for OAuth tokens)
- Add user info display to status command via getUserInfo()
- Add 'name' field to UserInfo type and database schema
- Clean up excessive newlines in command output
diff --git a/src/commands/auth/login.ts b/src/commands/auth/login.ts
@@ -10,31 +10,14 @@ import { getDbPath } from "../../lib/db/index.js";
 import { setUserInfo } from "../../lib/db/user.js";
 import { AuthError } from "../../lib/errors.js";
 import { muted, success } from "../../lib/formatters/colors.js";
-import { formatDuration } from "../../lib/formatters/human.js";
+import {
+  formatDuration,
+  formatUserIdentity,
+} from "../../lib/formatters/human.js";
 import { completeOAuthFlow, performDeviceFlow } from "../../lib/oauth.js";
 import { generateQRCode } from "../../lib/qrcode.js";
 import type { SentryUser } from "../../types/index.js";
 
-/**
- * Format user identity for display.
- * Handles missing username/email gracefully.
- */
-function formatUserIdentity(user: SentryUser): string {
-  const { username, email, id } = user;
-
-  if (username && email) {
-    return `${username} <${email}>`;
-  }
-  if (username) {
-    return username;
-  }
-  if (email) {
-    return email;
-  }
-  // Fallback to user ID if no username/email
-  return `user ${id}`;
-}
-
 type LoginFlags = {
   readonly token?: string;
   readonly timeout: number;
@@ -100,14 +83,15 @@ export const loginCommand = buildCommand({
           userId: user.id,
           email: user.email,
           username: user.username,
+          name: user.name,
         });
       } catch (error) {
         // Report to Sentry but don't block auth - user info is not critical
         Sentry.captureException(error);
       }
 
       stdout.write(`${success("✓")} Authenticated with API token\n`);
-      stdout.write(`  Logged in as ${muted(formatUserIdentity(user))}\n`);
+      stdout.write(`  Logged in as: ${muted(formatUserIdentity(user))}\n`);
       stdout.write(`  Config saved to: ${getDbPath()}\n`);
       return;
     }
@@ -166,28 +150,29 @@ export const loginCommand = buildCommand({
       );
 
       // Clear the polling dots
-      stdout.write("\n\n");
+      stdout.write("\n");
 
       // Store the token
       await completeOAuthFlow(tokenResponse);
 
-      // Fetch and store user info for telemetry
-      let user: SentryUser | undefined;
-      try {
-        user = await getCurrentUser();
-        setUserInfo({
-          userId: user.id,
-          email: user.email,
-          username: user.username,
-        });
-      } catch (error) {
-        // Report to Sentry but don't block auth - user info is not critical
-        Sentry.captureException(error);
+      // Store user info from token response for telemetry and display
+      const user = tokenResponse.user;
+      if (user) {
+        try {
+          setUserInfo({
+            userId: user.id,
+            email: user.email,
+            name: user.name,
+          });
+        } catch (error) {
+          // Report to Sentry but don't block auth - user info is not critical
+          Sentry.captureException(error);
+        }
       }
 
       stdout.write(`${success("✓")} Authentication successful!\n`);
       if (user) {
-        stdout.write(`  Logged in as ${muted(formatUserIdentity(user))}\n`);
+        stdout.write(`  Logged in as: ${muted(formatUserIdentity(user))}\n`);
       }
       stdout.write(`  Config saved to: ${getDbPath()}\n`);
 
diff --git a/src/commands/auth/status.ts b/src/commands/auth/status.ts
@@ -17,15 +17,31 @@ import {
   getDefaultProject,
 } from "../../lib/db/defaults.js";
 import { getDbPath } from "../../lib/db/index.js";
+import { getUserInfo } from "../../lib/db/user.js";
 import { AuthError } from "../../lib/errors.js";
-import { error, success } from "../../lib/formatters/colors.js";
-import { formatExpiration, maskToken } from "../../lib/formatters/human.js";
+import { error, muted, success } from "../../lib/formatters/colors.js";
+import {
+  formatExpiration,
+  formatUserIdentity,
+  maskToken,
+} from "../../lib/formatters/human.js";
 import type { Writer } from "../../types/index.js";
 
 type StatusFlags = {
   readonly showToken: boolean;
 };
 
+/**
+ * Write user identity information
+ */
+function writeUserInfo(stdout: Writer): void {
+  const user = getUserInfo();
+  if (!user) {
+    return;
+  }
+  stdout.write(`User: ${muted(formatUserIdentity(user))}\n`);
+}
+
 /**
  * Write token information
  */
@@ -123,13 +139,15 @@ export const statusCommand = buildCommand({
     const auth = await getAuthConfig();
     const authenticated = await isAuthenticated();
 
-    stdout.write(`Config: ${getDbPath()}\n\n`);
+    stdout.write(`Config: ${getDbPath()}\n`);
 
     if (!authenticated) {
       throw new AuthError("not_authenticated");
     }
 
-    stdout.write(`Status: Authenticated ${success("✓")}\n\n`);
+    stdout.write(`Status: Authenticated ${success("✓")}\n`);
+    writeUserInfo(stdout);
+    stdout.write("\n");
 
     writeTokenInfo(stdout, auth, flags.showToken);
     await writeDefaults(stdout);
diff --git a/src/lib/db/schema.ts b/src/lib/db/schema.ts
@@ -4,7 +4,7 @@
 
 import type { Database } from "bun:sqlite";
 
-const CURRENT_SCHEMA_VERSION = 2;
+const CURRENT_SCHEMA_VERSION = 3;
 
 /** User identity for telemetry (single row, id=1) */
 const USER_INFO_TABLE = `
@@ -13,6 +13,7 @@ const USER_INFO_TABLE = `
     user_id TEXT NOT NULL,
     email TEXT,
     username TEXT,
+    name TEXT,
     updated_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
   )
 `;
@@ -141,6 +142,24 @@ export function runMigrations(db: Database): void {
     `);
   }
 
+  // Migration 2 -> 3: Add name column to user_info table
+  // Check if column exists first to handle concurrent CLI processes
+  // (SQLite lacks ADD COLUMN IF NOT EXISTS)
+  if (currentVersion < 3 && currentVersion >= 2) {
+    const hasNameColumn =
+      (
+        db
+          .query(
+            "SELECT COUNT(*) as count FROM pragma_table_info('user_info') WHERE name='name'"
+          )
+          .get() as { count: number }
+      ).count > 0;
+
+    if (!hasNameColumn) {
+      db.exec("ALTER TABLE user_info ADD COLUMN name TEXT");
+    }
+  }
+
   // Update schema version if needed
   if (currentVersion < CURRENT_SCHEMA_VERSION) {
     db.query("UPDATE schema_version SET version = ?").run(
diff --git a/src/lib/db/user.ts b/src/lib/db/user.ts
@@ -11,12 +11,15 @@ export type UserInfo = {
   userId: string;
   email?: string;
   username?: string;
+  /** Display name (different from username) */
+  name?: string;
 };
 
 type UserRow = {
   user_id: string;
   email: string | null;
   username: string | null;
+  name: string | null;
 };
 
 /**
@@ -37,6 +40,7 @@ export function getUserInfo(): UserInfo | undefined {
     userId: row.user_id,
     email: row.email ?? undefined,
     username: row.username ?? undefined,
+    name: row.name ?? undefined,
   };
 }
 
@@ -56,6 +60,7 @@ export function setUserInfo(info: UserInfo): void {
       user_id: info.userId,
       email: info.email ?? null,
       username: info.username ?? null,
+      name: info.name ?? null,
       updated_at: now,
     },
     ["id"]
diff --git a/src/lib/formatters/human.ts b/src/lib/formatters/human.ts
@@ -1472,6 +1472,50 @@ export function formatProjectDetails(
   return lines;
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+// User Identity Formatting
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * User identity fields for display formatting.
+ * Accepts both UserInfo (userId) and token response user (id) shapes.
+ */
+type UserIdentityInput = {
+  /** User ID (from token response) */
+  id?: string;
+  /** User ID (from stored UserInfo) */
+  userId?: string;
+  email?: string;
+  username?: string;
+  /** Display name (different from username) */
+  name?: string;
+};
+
+/**
+ * Format user identity for display.
+ * Prefers name over username, handles missing fields gracefully.
+ *
+ * @param user - User identity object (supports both id and userId fields)
+ * @returns Formatted string like "Name <email>" or fallback to available fields
+ */
+export function formatUserIdentity(user: UserIdentityInput): string {
+  const { name, username, email, id, userId } = user;
+  const displayName = name ?? username;
+  const finalId = id ?? userId;
+
+  if (displayName && email) {
+    return `${displayName} <${email}>`;
+  }
+  if (displayName) {
+    return displayName;
+  }
+  if (email) {
+    return email;
+  }
+  // Fallback to user ID if no name/username/email
+  return `user ${finalId}`;
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Token Formatting
 // ─────────────────────────────────────────────────────────────────────────────
diff --git a/test/lib/db/user.test.ts b/test/lib/db/user.test.ts
@@ -36,17 +36,36 @@ describe("getUserInfo", () => {
       userId: "12345",
       email: "test@example.com",
       username: "testuser",
+      name: undefined,
     });
   });
 
-  test("handles missing email and username", () => {
+  test("returns stored user info with name", () => {
+    setUserInfo({
+      userId: "12345",
+      email: "test@example.com",
+      username: "testuser",
+      name: "Test User",
+    });
+
+    const result = getUserInfo();
+    expect(result).toEqual({
+      userId: "12345",
+      email: "test@example.com",
+      username: "testuser",
+      name: "Test User",
+    });
+  });
+
+  test("handles missing email, username, and name", () => {
     setUserInfo({ userId: "12345" });
 
     const result = getUserInfo();
     expect(result).toEqual({
       userId: "12345",
       email: undefined,
       username: undefined,
+      name: undefined,
     });
   });
 });
@@ -57,21 +76,24 @@ describe("setUserInfo", () => {
       userId: "user123",
       email: "user@test.com",
       username: "myuser",
+      name: "My User",
     });
 
     const result = getUserInfo();
     expect(result?.userId).toBe("user123");
     expect(result?.email).toBe("user@test.com");
     expect(result?.username).toBe("myuser");
+    expect(result?.name).toBe("My User");
   });
 
   test("overwrites existing user info", () => {
-    setUserInfo({ userId: "first", email: "first@test.com" });
-    setUserInfo({ userId: "second", email: "second@test.com" });
+    setUserInfo({ userId: "first", email: "first@test.com", name: "First" });
+    setUserInfo({ userId: "second", email: "second@test.com", name: "Second" });
 
     const result = getUserInfo();
     expect(result?.userId).toBe("second");
     expect(result?.email).toBe("second@test.com");
+    expect(result?.name).toBe("Second");
   });
 
   test("stores user info with only userId", () => {
@@ -81,5 +103,20 @@ describe("setUserInfo", () => {
     expect(result?.userId).toBe("minimal");
     expect(result?.email).toBeUndefined();
     expect(result?.username).toBeUndefined();
+    expect(result?.name).toBeUndefined();
+  });
+
+  test("stores user info with name but no username", () => {
+    setUserInfo({
+      userId: "user456",
+      email: "user@test.com",
+      name: "Display Name",
+    });
+
+    const result = getUserInfo();
+    expect(result?.userId).toBe("user456");
+    expect(result?.email).toBe("user@test.com");
+    expect(result?.username).toBeUndefined();
+    expect(result?.name).toBe("Display Name");
   });
 });
diff --git a/test/lib/formatters/human.test.ts b/test/lib/formatters/human.test.ts
