nworks-plus 1.4.4 → 1.4.5

package/dist/index.js

@@ -733,17 +733,24 @@ var logoutCommand = new Command2("logout").description("Remove stored credential
 
 // src/commands/whoami.ts
 import { Command as Command3 } from "commander";
+function describeToken(token) {
+  const expiresAt = token?.expiresAt;
+  if (typeof expiresAt !== "number" || isNaN(expiresAt) || expiresAt <= 0) {
+    return { valid: false, expiresAt: "(no token)" };
+  }
+  return {
+    valid: expiresAt > Date.now() / 1e3,
+    expiresAt: new Date(expiresAt * 1e3).toISOString()
+  };
+}
 var whoamiCommand = new Command3("whoami").description("Show current authentication status").option("--profile <name>", "Profile name", "default").option("--json", "JSON output").action(async (opts) => {
   try {
     const profile = opts.profile;
     const creds = await loadCredentials(profile);
     const token = await loadToken(profile);
-    const expiresAt = token ? token.expiresAt : null;
-    const isValid = typeof expiresAt === "number" && !isNaN(expiresAt) ? expiresAt > Date.now() / 1e3 : false;
-    let tokenExpiresAt = "(no token)";
-    if (typeof expiresAt === "number" && !isNaN(expiresAt) && expiresAt > 0) {
-      tokenExpiresAt = new Date(expiresAt * 1e3).toISOString();
-    }
+    const userToken = await loadUserToken(profile);
+    const service = describeToken(token);
+    const user = describeToken(userToken);
     output(
       {
         profile,
@@ -751,8 +758,11 @@ var whoamiCommand = new Command3("whoami").description("Show current authenticat
         clientId: creds.clientId,
         botId: creds.botId ?? "(not set)",
         domainId: creds.domainId ?? "(not set)",
-        tokenValid: isValid,
-        tokenExpiresAt
+        tokenValid: service.valid,
+        tokenExpiresAt: service.expiresAt,
+        userOAuthValid: user.valid,
+        userOAuthExpiresAt: user.expiresAt,
+        userOAuthScope: userToken?.scope ?? "(not set)"
       },
       opts
     );