Merge branch 'refs/heads/feat-multiple-accounts-and-instances' into feat-arg-project-init

Author: byawitz

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

@@ -6,13 +6,23 @@ 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, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
+const { questionsLogin, questionLoginWithEndpoint, 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 answers = email && password ? { email, password } : await inquirer.prompt(questionsLogin);
+    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);
+    }
+
 
     if (answers.method === 'select') {
         const accountId = answers.accountId;
@@ -27,19 +37,12 @@ const loginCommand = async ({ selfHosted, email, password, endpoint, mfa, code }
         return;
     }
 
-    const oldCurrent = globalConfig.getCurrentLogin();
     const id = ID.unique();
 
-    globalConfig.setCurrentLogin(id);
     globalConfig.addLogin(id, {});
+    globalConfig.setCurrentLogin(id);
+    globalConfig.setEndpoint(configEndpoint);
     globalConfig.setEmail(answers.email);
-    globalConfig.setEndpoint(DEFAULT_ENDPOINT);
-
-    if (selfHosted) {
-        const selfHostedAnswers = endpoint ? { endpoint } : await inquirer.prompt(questionGetEndpoint);
-
-        globalConfig.setEndpoint(selfHostedAnswers.endpoint);
-    }
 
     let client = await sdkForConsole(false);
 

templates/cli/lib/questions.js.twig

@@ -1,4 +1,5 @@
 const chalk = require("chalk");
+const Client = require("./client");
 const { localConfig, globalConfig } = require('./config');
 const { projectsList } = require('./commands/projects');
 const { teamsList } = require('./commands/teams');
@@ -471,8 +472,39 @@ const questionsLogin = [
         },
         when: (answers) => answers.method === 'select'
     },
-
 ];
+const questionGetEndpoint = [
+    {
+        type: "input",
+        name: "endpoint",
+        message: "Enter the endpoint of your {{ spec.title|caseUcfirst }} server",
+        default: "http://localhost/v1",
+        async validate(value) {
+            if (!value) {
+                return "Please enter a valid endpoint.";
+            }
+            let client = new Client().setEndpoint(value);
+            try {
+                let response = await client.call('get', '/health/version');
+                if (response.version) {
+                    return true;
+                } else {
+                    throw new Error();
+                }
+            } catch (error) {
+                return "Invalid endpoint or your Appwrite server is not running as expected.";
+            }
+        }
+    }
+];
+
+const questionLoginWithEndpoint = [
+    questionsLogin[0],
+    { ...questionGetEndpoint[0], when: (answers) => answers.method !== 'select' },
+    questionsLogin[1],
+    questionsLogin[2],
+    questionsLogin[3]
+]
 
 const questionsLogout = [
     {
@@ -719,30 +751,7 @@ const questionsMfaChallenge = [
     }
 ];
 
-const questionGetEndpoint = [
-    {
-        type: "input",
-        name: "endpoint",
-        message: "Enter the endpoint of your {{ spec.title|caseUcfirst }} server",
-        default: "http://localhost/v1",
-        async validate(value) {
-            if (!value) {
-                return "Please enter a valid endpoint.";
-            }
-            let client = new Client().setEndpoint(value);
-            try {
-                let response = await client.call('get', '/health/version');
-                if (response.version) {
-                    return true;
-                } else {
-                    throw new Error();
-                }
-            } catch (error) {
-                return "Invalid endpoint or your Appwrite server is not running as expected.";
-            }
-        }
-    }
-];
+
 
 module.exports = {
     questionsInitProject,
@@ -765,5 +774,6 @@ module.exports = {
     questionsGetEntrypoint,
     questionsListFactors,
     questionsMfaChallenge,
-    questionGetEndpoint
+    questionGetEndpoint,
+    questionLoginWithEndpoint
 };