feat: show organization name in whoami output

Author: apucacao

cmd/whoami/whoami.go

@@ -39,6 +39,10 @@ type memberSummary struct {
 	Role      string `json:"role"`
 }
 
+type accountSummary struct {
+	Organization string `json:"organization"`
+}
+
 func NewWhoAmICmd(client resources.Client) *cobra.Command {
 	cmd := &cobra.Command{
 		Args:  cobra.NoArgs,
@@ -119,12 +123,25 @@ func makeRequest(client resources.Client) func(*cobra.Command, []string) error {
 			}
 		}
 
-		fmt.Fprint(cmd.OutOrStdout(), formatPlaintext(identity, member)+"\n")
+		// Fetch the account to resolve the organization name. This endpoint is a
+		// real public-API route but isn't published in the OpenAPI spec, so we
+		// treat it as best-effort and fall back to the account ID on any failure.
+		var account *accountSummary
+		accountPath, _ := url.JoinPath(baseURI, "api/v2/account")
+		accountRes, err := client.MakeRequest(accessToken, "GET", accountPath, "application/json", nil, nil, false)
+		if err == nil {
+			var a accountSummary
+			if json.Unmarshal(accountRes, &a) == nil {
+				account = &a
+			}
+		}
+
+		fmt.Fprint(cmd.OutOrStdout(), formatPlaintext(identity, member, account)+"\n")
 		return nil
 	}
 }
 
-func formatPlaintext(identity callerIdentity, member *memberSummary) string {
+func formatPlaintext(identity callerIdentity, member *memberSummary, account *accountSummary) string {
 	var sb strings.Builder
 
 	if member != nil {
@@ -147,7 +164,13 @@ func formatPlaintext(identity callerIdentity, member *memberSummary) string {
 		fmt.Fprintf(&sb, "Token:   %s (%s)\n", identity.ClientID, tokenKind)
 	}
 
-	if identity.AccountID != "" {
+	if account != nil && account.Organization != "" {
+		if identity.AccountID != "" {
+			fmt.Fprintf(&sb, "Account: %s (%s)\n", account.Organization, identity.AccountID)
+		} else {
+			fmt.Fprintf(&sb, "Account: %s\n", account.Organization)
+		}
+	} else if identity.AccountID != "" {
 		fmt.Fprintf(&sb, "Account: %s\n", identity.AccountID)
 	}
 

cmd/whoami/whoami_test.go

@@ -34,11 +34,12 @@ func (c *sequentialMockClient) MakeUnauthenticatedRequest(_ string, _ string, _
 }
 
 func TestWhoAmI(t *testing.T) {
-	t.Run("shows member name, email, role, and token", func(t *testing.T) {
+	t.Run("shows member name, email, role, token, and organization", func(t *testing.T) {
 		mockClient := &sequentialMockClient{
 			responses: [][]byte{
 				[]byte(`{"memberId": "abc123", "tokenName": "my-token", "tokenKind": "personal", "accountId": "acct1"}`),
 				[]byte(`{"_id": "abc123", "email": "ariel@acme.com", "firstName": "Ariel", "lastName": "Flores", "role": "admin"}`),
+				[]byte(`{"_id": "acct1", "organization": "Acme Inc"}`),
 			},
 		}
 
@@ -55,6 +56,30 @@ func TestWhoAmI(t *testing.T) {
 		assert.Contains(t, string(output), "Ariel Flores <ariel@acme.com>")
 		assert.Contains(t, string(output), "Role:    admin")
 		assert.Contains(t, string(output), "Token:   my-token (personal)")
+		assert.Contains(t, string(output), "Account: Acme Inc (acct1)")
+	})
+
+	t.Run("falls back to account ID when organization is unavailable", func(t *testing.T) {
+		mockClient := &sequentialMockClient{
+			responses: [][]byte{
+				[]byte(`{"memberId": "abc123", "tokenName": "my-token", "tokenKind": "personal", "accountId": "acct1"}`),
+				[]byte(`{"_id": "abc123", "email": "ariel@acme.com", "firstName": "Ariel", "lastName": "Flores", "role": "admin"}`),
+				[]byte(`{"_id": "acct1"}`),
+			},
+		}
+
+		t.Setenv("LD_ACCESS_TOKEN", "abcd1234")
+
+		output, err := cmd.CallCmd(
+			t,
+			cmd.APIClients{ResourcesClient: mockClient},
+			analytics.NoopClientFn{}.Tracker(),
+			[]string{"whoami"},
+		)
+
+		require.NoError(t, err)
+		assert.Contains(t, string(output), "Account: acct1")
+		assert.NotContains(t, string(output), "Account: Acme")
 	})
 
 	t.Run("without member ID shows token info only", func(t *testing.T) {