Merge branch 'refs/heads/feat-cli-whoami-command' into feat-multiple-accounts-and-instances

Author: byawitz

templates/cli/lib/commands/generic.js.twig

@@ -80,12 +80,10 @@ const loginCommand = async ({ selfHosted }) => {
 
 const whoami = new Command("whoami")
     .description(commandDescriptions['whoami'])
-    .configureHelp({
-        helpWidth: process.stdout.columns || 80
-    })
-    .action(actionRunner(async () => {
+    .option("-j, --json", "Output in JSON format")
+    .action(actionRunner(async ({ json }) => {
         if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
-            error("No user is signed in");
+            error("No user is signed in. To sign in, run: appwrite login ");
             return;
         }
 
@@ -99,20 +97,23 @@ const whoami = new Command("whoami")
                 parseOutput: false
             });
         } catch (error) {
-            error("No user is signed in");
+            error("No user is signed in. To sign in, run: appwrite login");
             return;
         }
 
-        success("Signed in");
-
         const data = [
             {
                 'ID': account.$id,
                 'Name': account.name,
                 'Email': account.email,
-                'MFA enabled': account.mfa
+                'MFA enabled': account.mfa ? 'Yes' : 'No'
             }
         ];
+        if (json) {
+            console.log(data);
+
+            return;
+        }
 
         drawTable(data)
     }));

templates/cli/lib/parser.js.twig

@@ -168,7 +168,7 @@ const commandDescriptions = {
     "client": `The client command allows you to configure your CLI`,
     "login": `The login command allows you to authenticate and manage a user account.`,
     "logout": `The logout command allows you to logout of your {{ spec.title|caseUcfirst }} account.`,
-    "whoami": `The whoami command gives a basic account information about the logged in user.`,
+    "whoami": `The whoami command gives information about the currently logged in user.`,
     "console" : `The console command allows gives you access to the APIs used by the Appwrite console.`,
     "assistant": `The assistant command allows you to interact with the Appwrite Assistant AI`,
     "messaging": `The messaging command allows you to send messages.`,