Merge remote-tracking branch 'origin/feat-multiple-accounts-and-instances' into feat-multiple-accounts-and-instances

# Conflicts:
#	templates/cli/lib/commands/push.js.twig
#	templates/cli/lib/config.js.twig

Author: byawitz

templates/cli/base/requests/api.twig

@@ -19,7 +19,7 @@
     if (parseOutput) {
     {%~ if methodHaveConsolePreview(method.name,service.name) %}
         if(console) {
-            showConsoleLink('{{service.name}}', '{{ method.name }}',open
+            showConsoleLink('{{service.name}}', '{{ method.name }}'
         {%- for parameter in method.parameters.path -%}{%- set param = (parameter.name | caseCamel | escapeKeyword)  -%}{%- if param  ends with 'Id' -%}, {{ param }} {%- endif -%}{%- endfor -%}
             );
          } else {

templates/cli/index.js.twig

@@ -10,6 +10,7 @@ const chalk = require("chalk");
 const { version } = require("./package.json");
 const { commandDescriptions, cliConfig } = require("./lib/parser");
 const { client } = require("./lib/commands/generic");
+const inquirer = require("inquirer");
 {% if sdk.test != "true" %}
 const { login, logout, whoami, migrate } = require("./lib/commands/generic");
 const { init } = require("./lib/commands/init");
@@ -22,6 +23,8 @@ const { migrate } = require("./lib/commands/generic");
 const { {{ service.name | caseLower }} } = require("./lib/commands/{{ service.name | caseLower }}");
 {% endfor %}
 
+inquirer.registerPrompt('search-list', require('inquirer-search-list'));
+
 program
   .description(commandDescriptions['main'])
   .configureHelp({

templates/cli/lib/client.js.twig

@@ -4,10 +4,11 @@ const { fetch, FormData, Agent } = require("undici");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const {{spec.title | caseUcfirst}}Exception = require("./exception.js");
 const { globalConfig } = require("./config.js");
+const { log } = require('./parser');
 
 class Client {
   CHUNK_SIZE = 5*1024*1024; // 5MB
-  
+
   constructor() {
     this.endpoint = '{{spec.endpoint}}';
     this.headers = {
@@ -144,6 +145,13 @@ class Client {
       } catch (error) {
         throw new {{spec.title | caseUcfirst}}Exception(text, response.status, "", text);
       }
+
+      if (path !== '/account' && json.code === 401 && json.type === 'user_more_factors_required') {
+        log('Unusable account found, removing...')
+        const current = globalConfig.getCurrentLogin();
+        globalConfig.setCurrentLogin('');
+        globalConfig.removeLogin(current);
+      }
       throw new {{spec.title | caseUcfirst}}Exception(json.message, json.code, json.type, json);
     }
 

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

@@ -70,7 +70,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({
         {%- if 'multipart/form-data' in method.consumes -%},onProgress = () => {}{%- endif -%}
 
         {%- if method.type == 'location' -%}, destination{%- endif -%}
-        {% if methodHaveConsolePreview(method.name,service.name) %}, console, open{%- endif -%}
+        {% if methodHaveConsolePreview(method.name,service.name) %}, console{%- endif -%}
 }) => {
 {%~ endblock %}
     let client = !sdk ? await {% if service.name == "projects" %}sdkForConsole(){% else %}sdkForProject(){% endif %} :
@@ -97,7 +97,6 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({
 {% endif %}
 {% if methodHaveConsolePreview(method.name,service.name) %}
     .option(`--console`, `Get the resource console url`)
-    .option(`--open`, `Use with '--console' to open the using default browser`)
 {% endif %}
 {% endautoescape %}
     .action(actionRunner({{ service.name | caseLower }}{{ method.name | caseUcfirst }}))

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

@@ -6,23 +6,16 @@ const { globalConfig, localConfig } = require("../config");
 const { actionRunner, success, parseBool, commandDescriptions, error, parse, log, drawTable } = require("../parser");
 const ID = require("../id");
 {% if sdk.test != "true" %}
-const { questionsLogin, questionLoginWithEndpoint, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
-const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
+const { questionsLogin, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
+const {  accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
 const DEFAULT_ENDPOINT = 'https://cloud.appwrite.io/v1';
 
-const loginCommand = async ({ selfHosted, email, password, endpoint, mfa, code }) => {
+const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
     const oldCurrent = globalConfig.getCurrentLogin();
-    let answers = {};
-    let configEndpoint = DEFAULT_ENDPOINT;
-
-    if (selfHosted) {
-        answers = endpoint && email && password ? { endpoint, email, password } : await inquirer.prompt(questionLoginWithEndpoint);
-        configEndpoint =  answers.endpoint;
-    } else {
-        answers = email && password ? { email, password } : await inquirer.prompt(questionsLogin);
-    }
+    let configEndpoint = endpoint ?? DEFAULT_ENDPOINT;
 
+    const answers = email && password ? { email, password } : await inquirer.prompt(questionsLogin);
 
     if (answers.method === 'select') {
         const accountId = answers.accountId;
@@ -123,7 +116,8 @@ const whoami = new Command("whoami")
                 'ID': account.$id,
                 'Name': account.name,
                 'Email': account.email,
-                'MFA enabled': account.mfa ? 'Yes' : 'No'
+                'MFA enabled': account.mfa ? 'Yes' : 'No',
+                'Endpoint': globalConfig.getEndpoint()
             }
         ];
         if (json) {
@@ -137,7 +131,6 @@ const whoami = new Command("whoami")
 
 const login = new Command("login")
     .description(commandDescriptions['login'])
-    .option(`-sh, --self-hosted`, `Flag for enabling custom endpoint for self hosted instances`)
     .option(`--email [email]`, `User email`)
     .option(`--password [password]`, `User password`)
     .option(`--endpoint [endpoint]`, `Appwrite endpoint for self hosted instances`)