@zuplo/cli 6.69.5 → 6.69.8

package/dist/whoami/handler.js

@@ -1,23 +1,18 @@
-import { logger } from "../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printResultToConsoleAndExitGracefully, textOrJson, } from "../common/output.js";
-import settings from "../common/settings.js";
+import { createApiClient } from "../common/api/client.js";
+import { printResultToConsoleAndExitGracefully } from "../common/output.js";
+import { getAuthToken } from "../login/tokens.js";
 export async function whoami(argv) {
-    const response = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
-        headers: {
-            Authorization: `Bearer ${argv.authToken}`,
-        },
-    });
-    if (!response.ok) {
-        logger.error({
-            status: response.status,
-            statusText: response.statusText,
-            response: textOrJson(await response.text()),
-        }, "Failed to determine current user");
-        await printCriticalFailureToConsoleAndExit("Error: Failed to determine current user. Check your credentials.");
+    const apiKey = argv["api-key"]?.trim();
+    const authToken = apiKey || (await getAuthToken());
+    if (!authToken) {
+        await printResultToConsoleAndExitGracefully("You are logged out");
         return;
     }
-    const data = (await response.json());
+    const client = createApiClient({ authToken });
+    const data = await client.get("/v1/who-am-i", {
+        operation: "Failed to determine current user",
+        errorMessage: "Error: Failed to determine current user. Check your credentials.",
+    });
     const identity = data.email ? `${data.email} (${data.sub})` : data.sub;
     const lines = [`Authenticated as ${identity}`];
     if (data.account) {

package/dist/whoami/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/whoami/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EACL,oCAAoC,EACpC,qCAAqC,EACrC,UAAU,GACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAY7C,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAe;IAC1C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,GAAG,QAAQ,CAAC,4BAA4B,cAAc,EACtD;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YAEP,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,EAAE;SAC1C;KACF,CACF,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,CACV;YACE,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,QAAQ,EAAE,UAAU,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC5C,EACD,kCAAkC,CACnC,CAAC;QACF,MAAM,oCAAoC,CACxC,kEAAkE,CACnE,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAmB,CAAC;IACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;IACvE,MAAM,KAAK,GAAG,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;IAC/C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,qCAAqC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAChE,CAAC","sourcesContent":["import { logger } from \"../common/logger.js\";\nimport {\n  printCriticalFailureToConsoleAndExit,\n  printResultToConsoleAndExitGracefully,\n  textOrJson,\n} from \"../common/output.js\";\nimport settings from \"../common/settings.js\";\n\nexport interface Arguments {\n  authToken: string;\n}\n\ninterface WhoAmIResponse {\n  sub: string;\n  account?: string;\n  email?: string;\n}\n\nexport async function whoami(argv: Arguments) {\n  const response = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`,\n    {\n      method: \"GET\",\n      headers: {\n        // biome-ignore lint/style/useNamingConvention: External API property\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n    }\n  );\n\n  if (!response.ok) {\n    logger.error(\n      {\n        status: response.status,\n        statusText: response.statusText,\n        response: textOrJson(await response.text()),\n      },\n      \"Failed to determine current user\"\n    );\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to determine current user. Check your credentials.\"\n    );\n    return;\n  }\n\n  const data = (await response.json()) as WhoAmIResponse;\n  const identity = data.email ? `${data.email} (${data.sub})` : data.sub;\n  const lines = [`Authenticated as ${identity}`];\n  if (data.account) {\n    lines.push(`Account: ${data.account}`);\n  }\n\n  await printResultToConsoleAndExitGracefully(lines.join(\"\\n\"));\n}\n"]}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/whoami/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAYlD,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAe;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,YAAY,EAAE,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,qCAAqC,CAAC,oBAAoB,CAAC,CAAC;QAClE,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,GAAG,CAAiB,cAAc,EAAE;QAC5D,SAAS,EAAE,kCAAkC;QAC7C,YAAY,EACV,kEAAkE;KACrE,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;IACvE,MAAM,KAAK,GAAG,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;IAC/C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,qCAAqC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAChE,CAAC","sourcesContent":["import { createApiClient } from \"../common/api/client.js\";\nimport { printResultToConsoleAndExitGracefully } from \"../common/output.js\";\nimport { getAuthToken } from \"../login/tokens.js\";\n\nexport interface Arguments {\n  \"api-key\"?: string;\n}\n\ninterface WhoAmIResponse {\n  sub: string;\n  account?: string;\n  email?: string;\n}\n\nexport async function whoami(argv: Arguments) {\n  const apiKey = argv[\"api-key\"]?.trim();\n  const authToken = apiKey || (await getAuthToken());\n\n  if (!authToken) {\n    await printResultToConsoleAndExitGracefully(\"You are logged out\");\n    return;\n  }\n\n  const client = createApiClient({ authToken });\n  const data = await client.get<WhoAmIResponse>(\"/v1/who-am-i\", {\n    operation: \"Failed to determine current user\",\n    errorMessage:\n      \"Error: Failed to determine current user. Check your credentials.\",\n  });\n\n  const identity = data.email ? `${data.email} (${data.sub})` : data.sub;\n  const lines = [`Authenticated as ${identity}`];\n  if (data.account) {\n    lines.push(`Account: ${data.account}`);\n  }\n\n  await printResultToConsoleAndExitGracefully(lines.join(\"\\n\"));\n}\n"]}