Merge branch 'refs/heads/feat-cli-g2' into feat-create-resources

# Conflicts:
#	templates/cli/index.js.twig
#	templates/cli/lib/commands/generic.js.twig

Author: byawitz

templates/cli/index.js.twig

@@ -11,8 +11,7 @@ const { version } = require("./package.json");
 const { commandDescriptions, cliConfig } = require("./lib/parser");
 const { client } = require("./lib/commands/generic");
 {% if sdk.test != "true" %}
-const { login, logout } = require("./lib/commands/generic");
-const { init } = require("./lib/commands/init");
+const { login, logout, whoami } = require("./lib/commands/generic");
 const { pull } = require("./lib/commands/pull");
 const { push } = require("./lib/commands/push");
 {% endif %}
@@ -37,6 +36,7 @@ program
   })
   .showSuggestionAfterError()
 {% if sdk.test != "true" %}
+  .addCommand(whoami)
   .addCommand(login)
   .addCommand(init)
   .addCommand(pull)

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

@@ -3,7 +3,7 @@ const { Command } = require("commander");
 const Client = require("../client");
 const { sdkForConsole } = require("../sdks");
 const { globalConfig, localConfig } = require("../config");
-const { actionRunner, success, parseBool, commandDescriptions, log, parse } = require("../parser");
+const { actionRunner, success, parseBool, commandDescriptions, error, parse, drawTable } = require("../parser");
 {% if sdk.test != "true" %}
 const { questionsLogin, questionsListFactors, questionsMfaChallenge } = require("../questions");
 const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
@@ -60,6 +60,47 @@ const loginCommand = async () => {
     success("Signed in as user with ID: " + account.$id);
 };
 
+const whoami = new Command("whoami")
+    .description(commandDescriptions['whoami'])
+    .option("-j, --json", "Output in JSON format")
+    .action(actionRunner(async ({ json }) => {
+        if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
+            error("No user is signed in. To sign in, run: appwrite login ");
+            return;
+        }
+
+        let client = await sdkForConsole(false);
+
+        let account;
+
+        try {
+            account = await accountGet({
+                sdk: client,
+                parseOutput: false
+            });
+        } catch (error) {
+            error("No user is signed in. To sign in, run: appwrite login");
+            return;
+        }
+
+        const data = [
+            {
+                'ID': account.$id,
+                'Name': account.name,
+                'Email': account.email,
+                'MFA enabled': account.mfa ? 'Yes' : 'No'
+            }
+        ];
+        if (json) {
+            console.log(data);
+
+            return;
+        }
+
+        drawTable(data)
+    }));
+
+
 const login = new Command("login")
     .description(commandDescriptions['login'])
     .configureHelp({
@@ -160,10 +201,11 @@ const client = new Command("client")
     }));
 
 module.exports = {
-{% if sdk.test != "true" %}
+    {% if sdk.test != "true" %}
     loginCommand,
+    whoami,
     login,
     logout,
-{% endif %}
+    {% endif %}
     client
 };

templates/cli/lib/parser.js.twig

@@ -169,6 +169,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 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.`,
@@ -185,6 +186,7 @@ const commandDescriptions = {
 }
 
 module.exports = {
+    drawTable,
     parse,
     actionRunner,
     parseInteger,