@get-dx/cli 0.5.0 → 0.5.1

package/dist/commands/auth.js

@@ -2,7 +2,7 @@ import { password, select } from "@inquirer/prompts";
 import { Command } from "commander";
 import { deleteToken, setToken } from "../secrets.js";
 import { renderJson } from "../renderers.js";
-import { renderAuthInfo, renderLoggedOut } from "./authRendering.js";
+import { renderAuthInfo, renderAuthWhoami, renderLoggedOut, } from "./authRendering.js";
 import { createExampleText, getContext, wrapAction, } from "../commandHelpers.js";
 import { persistBaseUrls, resolveApiBaseUrl, deriveBaseUrlsFromEnv, } from "../config.js";
 import { CliError } from "../errors.js";
@@ -51,12 +51,12 @@ export function authCommand() {
             }
             else {
                 token = await password({
-                    message: "Paste your account web API token here:",
+                    message: "Paste your personal access token or organization token here:",
                     mask: true,
                 });
             }
             if (!token) {
-                throw new CliError("Account web API token or personal access token is required");
+                throw new CliError("Personal access token or organization token is required");
             }
         }
         const runtime = await buildRuntime(context, {
@@ -128,6 +128,29 @@ export function authCommand() {
             renderAuthInfo(response, runtime.token, runtime.apiBaseUrl);
         }
     }));
+    auth
+        .command("whoami")
+        .description("Show user and team details for the authenticated token")
+        .addHelpText("afterAll", createExampleText([
+        {
+            label: "Fetch user and team details",
+            command: "dx auth whoami",
+        },
+        {
+            label: "Fetch user and team details as JSON",
+            command: "dx auth whoami --json",
+        },
+    ]))
+        .action(wrapAction(async (_options, command) => {
+        const runtime = await buildRuntime(getContext(command));
+        const response = await getAuthWhoami(runtime);
+        if (runtime.context.json) {
+            renderJson(response);
+        }
+        else {
+            renderAuthWhoami(response);
+        }
+    }));
     return auth;
 }
 // TODO: should we move this somewhere more central, since `init` needs it?
@@ -137,3 +160,9 @@ export async function getAuthInfo(runtime) {
     });
     return response.body;
 }
+export async function getAuthWhoami(runtime) {
+    const response = await request(runtime, "/auth.whoami", {
+        method: "GET",
+    });
+    return response.body;
+}

package/dist/commands/authRendering.js

@@ -37,10 +37,51 @@ function scopesContent(scopes) {
         ];
     }
 }
+export function renderAuthWhoami(response) {
+    const blocks = [];
+    // Auth section
+    blocks.push(ui.h3("Auth"));
+    blocks.push(ui.dl([
+        ui.dli("Account", response.account.name),
+        ui.dli("Token type", tokenTypeName(response.auth_token_type)),
+    ], { termWidth: 12 }));
+    // User section
+    blocks.push(ui.h3("Current user"));
+    if (response.user) {
+        blocks.push(ui.dl([
+            ui.dli("ID", ui.code(response.user.id)),
+            ui.dli("Name", response.user.name),
+            ui.dli("Email", response.user.email),
+        ], { termWidth: 7 }));
+    }
+    else {
+        blocks.push(ui.p(ui.dim("Not available for organization tokens")));
+    }
+    // Team section
+    blocks.push(ui.h3("Team"));
+    if (response.team) {
+        blocks.push(ui.dl([
+            ui.dli("ID", ui.code(response.team.id)),
+            ui.dli("Name", response.team.name),
+            ui.dli("Lead", formatUser(response.team.lead)),
+        ], { termWidth: 6 }));
+        if (response.team.contributors.length > 0) {
+            blocks.push(ui.p(ui.bold("Contributors:"), false));
+            blocks.push(ui.ul(response.team.contributors.map((c) => ui.li(formatUser(c)))));
+        }
+    }
+    else {
+        blocks.push(ui.p(ui.dim("Not available for organization tokens")));
+    }
+    renderRichText(blocks);
+}
+function formatUser(user) {
+    return `${user.name} ${ui.dim(`(${user.id}, ${user.email})`)}`;
+}
 function tokenTypeName(tokenType) {
     switch (tokenType) {
         case "account_web_api_token":
-            return "Account-level web API token";
+            return "Organization token";
         case "personal_access_token":
             return "Personal access token";
         default:

package/dist/commands/init.js

@@ -83,12 +83,12 @@ async function attemptLogin(apiBaseUrl, webBaseUrl, context) {
     }
     else {
         token = await password({
-            message: "Paste your account web API token here:",
+            message: "Paste your personal access token or organization token here:",
             mask: true,
         });
     }
     if (!token) {
-        throw new CliError("Account web API token is required");
+        throw new CliError("Personal access token or organization token is required");
     }
     const runtime = await buildRuntime(context, {
         apiBaseUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@get-dx/cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "DX CLI",
   "author": "DX <developers@getdx.com>",
   "bugs": {