Merge branch 'refs/heads/feat-multiple-accounts-and-instances' into feat-push-pull-all

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

Author: byawitz

templates/cli/index.js.twig

@@ -11,10 +11,12 @@ const { version } = require("./package.json");
 const { commandDescriptions, cliConfig } = require("./lib/parser");
 const { client } = require("./lib/commands/generic");
 {% if sdk.test != "true" %}
-const { login, logout, whoami } = require("./lib/commands/generic");
+const { login, logout, whoami, migrate } = require("./lib/commands/generic");
 const { init } = require("./lib/commands/init");
 const { pull } = require("./lib/commands/pull");
 const { push } = require("./lib/commands/push");
+{% else %}
+const { migrate } = require("./lib/commands/generic");
 {% endif %}
 {% for service in spec.services %}
 const { {{ service.name | caseLower }} } = require("./lib/commands/{{ service.name | caseLower }}");
@@ -29,12 +31,30 @@ program
   .version(version, "-v, --version")
   .option("--verbose", "Show complete error log")
   .option("--json", "Output in JSON format")
+  .hook('preAction', migrate)
+  .option("-f,--force", "Flag to confirm all warnings")
+  .option("-a,--all", "Flag to push all resources")
+  .option("--id [id...]", "Flag to pass list of ids for a giving action")
+  .option("--report", "Enable reporting when cli is crashing")
   .on("option:json", () => {
     cliConfig.json = true;
   })
   .on("option:verbose", () => {
     cliConfig.verbose = true;
   })
+  .on("option:report", function() {
+    cliConfig.report = true;
+    cliConfig.reportData = { data: this };
+  })
+  .on("option:force", () => {
+    cliConfig.force = true;
+  })
+  .on("option:all", () => {
+    cliConfig.all = true;
+  })
+  .on("option:id", function() {
+    cliConfig.ids = this.opts().id;
+  })
   .showSuggestionAfterError()
 {% if sdk.test != "true" %}
   .addCommand(whoami)

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

@@ -1,45 +1,75 @@
 const inquirer = require("inquirer");
 const { Command } = require("commander");
 const Client = require("../client");
-const { sdkForConsole } = require("../sdks");
+const { sdkForConsole, questionGetEndpoint } = require("../sdks");
 const { globalConfig, localConfig } = require("../config");
-const { actionRunner, success, parseBool, commandDescriptions, error, parse, drawTable } = require("../parser");
+const { actionRunner, success, parseBool, commandDescriptions, error, parse, log, drawTable } = require("../parser");
+const ID = require("../id");
 {% if sdk.test != "true" %}
-const { questionsLogin, questionsListFactors, questionsMfaChallenge } = require("../questions");
+const { questionsLogin, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
 const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
-const loginCommand = async () => {
-    const answers = await inquirer.prompt(questionsLogin)
+const DEFAULT_ENDPOINT = 'https://cloud.appwrite.io/v1';
 
-    let client = await sdkForConsole(false);
+const loginCommand = async ({ selfHosted, email, password, endpoint, mfa, code }) => {
+    const answers = email && password ? { email, password } : await inquirer.prompt(questionsLogin);
 
-    await accountCreateEmailPasswordSession({
-        email: answers.email,
-        password: answers.password,
-        parseOutput: false,
-        sdk: client
-    })
+    if (answers.method === 'select') {
+        const accountId = answers.accountId;
+
+        if (!globalConfig.getLoginIds().includes(accountId)) {
+            throw Error('Login ID not found');
+        }
+
+        globalConfig.setCurrentLogin(accountId);
+        success(`Current account is ${accountId}`);
+
+        return;
+    }
+
+    const oldCurrent = globalConfig.getCurrentLogin();
+    const id = ID.unique();
 
-    client.setCookie(globalConfig.getCookie());
+    globalConfig.setCurrentLogin(id);
+    globalConfig.addLogin(id, {});
+    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);
 
     let account;
 
     try {
+        await accountCreateEmailPasswordSession({
+            email: answers.email,
+            password: answers.password,
+            parseOutput: false,
+            sdk: client
+        })
+
+        client.setCookie(globalConfig.getCookie());
+
         account = await accountGet({
             sdk: client,
             parseOutput: false
         });
-    } catch(error) {
+    } catch (error) {
         if (error.response === 'user_more_factors_required') {
-            const { factor } = await inquirer.prompt(questionsListFactors);
+            const { factor } = mfa ? { factor: mfa } : await inquirer.prompt(questionsListFactors);
 
             const challenge = await accountCreateMfaChallenge({
                 factor,
                 parseOutput: false,
                 sdk: client
             });
 
-            const { otp } = await inquirer.prompt(questionsMfaChallenge);
+            const { otp } = code ? { otp: code } : await inquirer.prompt(questionsMfaChallenge);
 
             await accountUpdateMfaChallenge({
                 challengeId: challenge.$id,
@@ -53,6 +83,8 @@ const loginCommand = async () => {
                 parseOutput: false
             });
         } else {
+            globalConfig.removeLogin(id);
+            globalConfig.setCurrentLogin(oldCurrent);
             throw error;
         }
     }
@@ -100,20 +132,21 @@ const whoami = new Command("whoami")
         drawTable(data)
     }));
 
-
 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`)
+    .option(`--mfa [factor]`, `Multi-factor authentication login factor: totp, email, phone or recoveryCode`)
+    .option(`--code [code]`, `Multi-factor code`)
     .configureHelp({
         helpWidth: process.stdout.columns || 80
     })
     .action(actionRunner(loginCommand));
 
-const logout = new Command("logout")
-    .description(commandDescriptions['logout'])
-    .configureHelp({
-        helpWidth: process.stdout.columns || 80
-    })
-    .action(actionRunner(async () => {
+const singleLogout = async (accountId) => {
+    try {
         let client = await sdkForConsole();
 
         await accountDeleteSession({
@@ -122,8 +155,51 @@ const logout = new Command("logout")
             sdk: client
         })
 
-        globalConfig.setCookie("");
-        success()
+        globalConfig.removeLogin(accountId);
+    } catch (e) {
+        error('Unable to log out, removing locally saved session information')
+    }
+    globalConfig.removeLogin(accountId);
+}
+
+const logout = new Command("logout")
+    .description(commandDescriptions['logout'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
+    .action(actionRunner(async () => {
+        const logins = globalConfig.getLogins();
+        const current = globalConfig.getCurrentLogin();
+
+        if (current === '') {
+            return;
+        }
+        if (logins.length === 1) {
+            await singleLogout(current);
+            success();
+
+            return;
+        }
+
+        const answers = await inquirer.prompt(questionsLogout);
+
+        if (answers.accounts) {
+            for (let accountId of answers.accounts) {
+                globalConfig.setCurrentLogin(accountId);
+                await singleLogout(accountId);
+            }
+        }
+
+        const leftLogins = globalConfig.getLogins();
+
+        if (leftLogins.length > 0 && leftLogins.filter(login => login.id === current).length !== 1) {
+            const accountId = leftLogins[0].id;
+            globalConfig.setCurrentLogin(accountId);
+
+            success(`Current account is ${accountId}`);
+        }
+
+        success();
     }));
 {% endif %}
 
@@ -156,6 +232,7 @@ const client = new Command("client")
 
         if (endpoint !== undefined) {
             try {
+                const id = ID.unique();
                 let url = new URL(endpoint);
                 if (url.protocol !== "http:" && url.protocol !== "https:") {
                     throw new Error();
@@ -170,7 +247,8 @@ const client = new Command("client")
                 if (!response.version) {
                     throw new Error();
                 }
-
+                globalConfig.setCurrentLogin(id);
+                globalConfig.addLogin(id, {});
                 globalConfig.setEndpoint(endpoint);
             } catch (_) {
                 throw new Error("Invalid endpoint or your Appwrite server is not running as expected.");
@@ -190,22 +268,45 @@ const client = new Command("client")
         }
 
         if (reset !== undefined) {
-            globalConfig.setEndpoint("");
-            globalConfig.setKey("");
-            globalConfig.setCookie("");
-            globalConfig.setSelfSigned("");
-            localConfig.setProject("", "");
+            const logins = globalConfig.getLogins();
+
+            for (let accountId of logins.map(login => login.id)) {
+                globalConfig.setCurrentLogin(accountId);
+                await singleLogout(accountId);
+            }
         }
 
         success()
     }));
 
+const migrate = async () => {
+    if (!globalConfig.has('endpoint') || !globalConfig.has('cookie')) {
+        return;
+    }
+
+    const endpoint = globalConfig.get('endpoint');
+    const cookie = globalConfig.get('cookie');
+
+    const id = ID.unique();
+    const data = {
+        endpoint,
+        cookie,
+        email: 'legacy'
+    };
+
+    globalConfig.addLogin(id, data);
+    globalConfig.setCurrentLogin(id);
+    globalConfig.delete('endpoint');
+    globalConfig.delete('cookie');
+
+}
 module.exports = {
     {% if sdk.test != "true" %}
     loginCommand,
     whoami,
     login,
     logout,
     {% endif %}
+    migrate,
     client
 };