appwrite-cli 13.0.0-rc.1 → 13.0.0-rc.3

package/lib/commands/generic.ts

@@ -1,338 +1,440 @@
-import inquirer from 'inquirer';
-import { Command } from 'commander';
-import Client from '../client';
-import { sdkForConsole } from '../sdks';
-import { globalConfig, localConfig } from '../config';
-import { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } from '../parser';
-import ID from '../id';
-import { questionsLogin, questionsLogout, questionsListFactors, questionsMFAChallenge } from '../questions';
-import { accountUpdateMFAChallenge, accountCreateMFAChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } from './account';
-
-const DEFAULT_ENDPOINT = 'https://cloud.appwrite.io/v1';
+import inquirer from "inquirer";
+import { Command } from "commander";
+import { Client } from "@appwrite.io/console";
+import { sdkForConsole } from "../sdks.js";
+import { globalConfig, localConfig } from "../config.js";
+import {
+  actionRunner,
+  success,
+  parseBool,
+  commandDescriptions,
+  error,
+  parse,
+  hint,
+  log,
+  drawTable,
+  cliConfig,
+} from "../parser.js";
+import ID from "../id.js";
+import {
+  questionsLogin,
+  questionsLogout,
+  questionsListFactors,
+  questionsMFAChallenge,
+} from "../questions.js";
+import { Account, Client as ConsoleClient } from "@appwrite.io/console";
+import ClientLegacy from "../client.js";
+
+const DEFAULT_ENDPOINT = "https://cloud.appwrite.io/v1";
 
 interface LoginCommandOptions {
-    email?: string;
-    password?: string;
-    endpoint?: string;
-    mfa?: string;
-    code?: string;
+  email?: string;
+  password?: string;
+  endpoint?: string;
+  mfa?: string;
+  code?: string;
 }
 
-export const loginCommand = async ({ email, password, endpoint, mfa, code }: LoginCommandOptions): Promise<void> => {
-    const oldCurrent = globalConfig.getCurrentSession();
+export const loginCommand = async ({
+  email,
+  password,
+  endpoint,
+  mfa,
+  code,
+}: LoginCommandOptions): Promise<void> => {
+  const oldCurrent = globalConfig.getCurrentSession();
 
-    const configEndpoint = (endpoint ?? globalConfig.getEndpoint()) || DEFAULT_ENDPOINT;
+  const configEndpoint =
+    (endpoint ?? globalConfig.getEndpoint()) || DEFAULT_ENDPOINT;
 
-    if (globalConfig.getCurrentSession() !== '') {
-        log('You are currently signed in as ' + globalConfig.getEmail());
+  if (globalConfig.getCurrentSession() !== "") {
+    log("You are currently signed in as " + globalConfig.getEmail());
 
-        if (globalConfig.getSessions().length === 1) {
-            hint('You can sign in and manage multiple accounts with Appwrite CLI');
-        }
+    if (globalConfig.getSessions().length === 1) {
+      hint("You can sign in and manage multiple accounts with Appwrite CLI");
     }
+  }
 
-    const answers = email && password ? { email, password } : await inquirer.prompt(questionsLogin);
-
-    if (!answers.method) {
-        answers.method = 'login';
-    }
+  const answers =
+    email && password
+      ? { email, password }
+      : await inquirer.prompt(questionsLogin);
 
-    if (answers.method === 'select') {
-        const accountId = answers.accountId;
+  if (!answers.method) {
+    answers.method = "login";
+  }
 
-        if (!globalConfig.getSessionIds().includes(accountId)) {
-            throw Error('Session ID not found');
-        }
+  if (answers.method === "select") {
+    const accountId = answers.accountId;
 
-        globalConfig.setCurrentSession(accountId);
-        success(`Current account is ${accountId}`);
+    if (!globalConfig.getSessionIds().includes(accountId)) {
+      throw Error("Session ID not found");
+    }
 
-        return;
+    globalConfig.setCurrentSession(accountId);
+    success(`Current account is ${accountId}`);
+
+    return;
+  }
+
+  const id = ID.unique();
+
+  globalConfig.addSession(id, { endpoint: configEndpoint });
+  globalConfig.setCurrentSession(id);
+  globalConfig.setEndpoint(configEndpoint);
+  globalConfig.setEmail(answers.email);
+
+  // Use legacy client for login to extract cookies from response
+  const legacyClient = new ClientLegacy();
+  legacyClient.setEndpoint(configEndpoint);
+  legacyClient.setProject("console");
+  if (globalConfig.getSelfSigned()) {
+    legacyClient.setSelfSigned(true);
+  }
+
+  let client = await sdkForConsole(false);
+  let accountClient = new Account(client);
+
+  let account;
+
+  try {
+    await legacyClient.call(
+      "POST",
+      "/account/sessions/email",
+      {
+        "content-type": "application/json",
+      },
+      {
+        email: answers.email,
+        password: answers.password,
+      },
+    );
+
+    const savedCookie = globalConfig.getCookie();
+
+    if (savedCookie) {
+      legacyClient.setCookie(savedCookie);
+      client.setCookie(savedCookie);
     }
 
-    const id = ID.unique();
-
-    globalConfig.addSession(id, {});
-    globalConfig.setCurrentSession(id);
-    globalConfig.setEndpoint(configEndpoint);
-    globalConfig.setEmail(answers.email);
-
-    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 (err: any) {
-        if (err.response === 'user_more_factors_required') {
-            const { factor } = mfa ? { factor: mfa } : await inquirer.prompt(questionsListFactors);
-
-            const challenge = await accountCreateMFAChallenge({
-                factor,
-                parseOutput: false,
-                sdk: client
-            });
-
-            const { otp } = code ? { otp: code } : await inquirer.prompt(questionsMFAChallenge);
-
-            await accountUpdateMFAChallenge({
-                challengeId: challenge.$id,
-                otp,
-                parseOutput: false,
-                sdk: client
-            });
-
-            account = await accountGet({
-                sdk: client,
-                parseOutput: false
-            });
-        } else {
-            globalConfig.removeSession(id);
-            globalConfig.setCurrentSession(oldCurrent);
-            if (endpoint !== DEFAULT_ENDPOINT && err.response === 'user_invalid_credentials') {
-                log('Use the --endpoint option for self-hosted instances')
-            }
-            throw err;
-        }
+    accountClient = new Account(client);
+    account = await accountClient.get();
+  } catch (err: any) {
+    if (
+      err.type === "user_more_factors_required" ||
+      err.response === "user_more_factors_required"
+    ) {
+      const { factor } = mfa
+        ? { factor: mfa }
+        : await inquirer.prompt(questionsListFactors);
+      const challenge = await accountClient.createMfaChallenge(factor);
+
+      const { otp } = code
+        ? { otp: code }
+        : await inquirer.prompt(questionsMFAChallenge);
+      await legacyClient.call(
+        "PUT",
+        "/account/mfa/challenges",
+        {
+          "content-type": "application/json",
+        },
+        {
+          challengeId: challenge.$id,
+          otp: otp,
+        },
+      );
+
+      const savedCookie = globalConfig.getCookie();
+      if (savedCookie) {
+        client.setCookie(savedCookie);
+      }
+
+      accountClient = new Account(client);
+      account = await accountClient.get();
+    } else {
+      globalConfig.removeSession(id);
+      globalConfig.setCurrentSession(oldCurrent);
+      if (
+        endpoint !== DEFAULT_ENDPOINT &&
+        (err.type === "user_invalid_credentials" ||
+          err.response === "user_invalid_credentials")
+      ) {
+        log("Use the --endpoint option for self-hosted instances");
+      }
+      throw err;
     }
+  }
 
-    success("Successfully signed in as " + account.email);
-    hint("Next you can create or link to your project using 'appwrite init project'");
+  success("Successfully signed in as " + account.email);
+  hint(
+    "Next you can create or link to your project using 'appwrite init project'",
+  );
 };
 
 export const whoami = new Command("whoami")
-    .description(commandDescriptions['whoami'])
-    .action(actionRunner(async () => {
-        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;
+  .description(commandDescriptions["whoami"])
+  .action(
+    actionRunner(async () => {
+      if (
+        globalConfig.getEndpoint() === "" ||
+        globalConfig.getCookie() === ""
+      ) {
+        error("No user is signed in. To sign in, run 'appwrite login'");
+        return;
+      }
 
-        try {
-            account = await accountGet({
-                sdk: client,
-                parseOutput: false
-            });
-        } catch (_) {
-            error("No user is signed in. To sign in, run 'appwrite login'");
-            return;
-        }
+      let client = await sdkForConsole(false);
+      let accountClient = new Account(client);
 
-        const data = [
-            {
-                'ID': account.$id,
-                'Name': account.name,
-                'Email': account.email,
-                'MFA enabled': account.mfa ? 'Yes' : 'No',
-                'Endpoint': globalConfig.getEndpoint()
-            }
-        ];
+      let account;
 
-        if (cliConfig.json) {
-            console.log(data);
-            return;
-        }
+      try {
+        account = await accountClient.get();
+      } catch (_) {
+        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",
+          Endpoint: globalConfig.getEndpoint(),
+        },
+      ];
+
+      if (cliConfig.json) {
+        console.log(data);
+        return;
+      }
 
-        drawTable(data)
-    }));
+      drawTable(data);
+    }),
+  );
 
 export const register = new Command("register")
-    .description(commandDescriptions['register'])
-    .action(actionRunner(async () => {
-        log('Visit https://cloud.appwrite.io/register to create an account')
-    }));
+  .description(commandDescriptions["register"])
+  .action(
+    actionRunner(async () => {
+      log("Visit https://cloud.appwrite.io/register to create an account");
+    }),
+  );
 
 export const login = new Command("login")
-    .description(commandDescriptions['login'])
-    .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));
+  .description(commandDescriptions["login"])
+  .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 deleteSession = async (accountId: string): Promise<void> => {
-    try {
-        let client = await sdkForConsole();
-
-        await accountDeleteSession({
-            sessionId: 'current',
-            parseOutput: false,
-            sdk: client
-        })
-    } catch (e) {
-        error('Unable to log out, removing locally saved session information')
-    } finally {
-        globalConfig.removeSession(accountId);
-    }
-}
+  try {
+    let client = await sdkForConsole();
+    let accountClient = new Account(client);
+
+    await accountClient.deleteSession("current");
+  } catch (e) {
+    error("Unable to log out, removing locally saved session information");
+  } finally {
+    globalConfig.removeSession(accountId);
+  }
+};
 
 export const logout = new Command("logout")
-    .description(commandDescriptions['logout'])
-    .configureHelp({
-        helpWidth: process.stdout.columns || 80
-    })
-    .action(actionRunner(async () => {
-        const sessions = globalConfig.getSessions();
-        const current = globalConfig.getCurrentSession();
-
-        if (current === '' || !sessions.length) {
-            log('No active sessions found.');
-            return;
-        }
-        if (sessions.length === 1) {
-            await deleteSession(current);
-            globalConfig.setCurrentSession('');
-            success("Logging out");
+  .description(commandDescriptions["logout"])
+  .configureHelp({
+    helpWidth: process.stdout.columns || 80,
+  })
+  .action(
+    actionRunner(async () => {
+      const sessions = globalConfig.getSessions();
+      const current = globalConfig.getCurrentSession();
+
+      if (current === "" || !sessions.length) {
+        log("No active sessions found.");
+        return;
+      }
+      if (sessions.length === 1) {
+        await deleteSession(current);
+        globalConfig.setCurrentSession("");
+        success("Logging out");
 
-            return;
-        }
+        return;
+      }
 
-        const answers = await inquirer.prompt(questionsLogout);
+      const answers = await inquirer.prompt(questionsLogout);
 
-        if (answers.accounts) {
-            for (let accountId of answers.accounts) {
-                globalConfig.setCurrentSession(accountId);
-                await deleteSession(accountId);
-            }
+      if (answers.accounts) {
+        for (let accountId of answers.accounts) {
+          globalConfig.setCurrentSession(accountId);
+          await deleteSession(accountId);
         }
+      }
 
-        const remainingSessions = globalConfig.getSessions();
+      const remainingSessions = globalConfig.getSessions();
 
-        if (remainingSessions.length > 0 && remainingSessions.filter((session: any) => session.id === current).length !== 1) {
-            const accountId = remainingSessions[0].id;
-            globalConfig.setCurrentSession(accountId);
+      if (
+        remainingSessions.length > 0 &&
+        remainingSessions.filter((session: any) => session.id === current)
+          .length !== 1
+      ) {
+        const accountId = remainingSessions[0].id;
+        globalConfig.setCurrentSession(accountId);
 
-            success(`Current account is ${accountId}`);
-        } else if (remainingSessions.length === 0) {
-            globalConfig.setCurrentSession('');
-        }
+        success(`Current account is ${accountId}`);
+      } else if (remainingSessions.length === 0) {
+        globalConfig.setCurrentSession("");
+      }
 
-        success("Logging out");
-    }));
+      success("Logging out");
+    }),
+  );
 
 interface ClientCommandOptions {
-    selfSigned?: boolean;
-    endpoint?: string;
-    projectId?: string;
-    key?: string;
-    debug?: boolean;
-    reset?: boolean;
+  selfSigned?: boolean;
+  endpoint?: string;
+  projectId?: string;
+  key?: string;
+  debug?: boolean;
+  reset?: boolean;
 }
 
 export const client = new Command("client")
-    .description(commandDescriptions['client'])
-    .configureHelp({
-        helpWidth: process.stdout.columns || 80
-    })
-    .option("-ss, --self-signed <value>", "Configure the CLI to use a self-signed certificate ( true or false )", parseBool)
-    .option("-e, --endpoint <endpoint>", "Set your Appwrite server endpoint")
-    .option("-p, --project-id <project-id>", "Set your Appwrite project ID")
-    .option("-k, --key <key>", "Set your Appwrite server's API key")
-    .option("-d, --debug", "Print CLI debug information")
-    .option("-r, --reset", "Reset the CLI configuration")
-    .action(actionRunner(async ({ selfSigned, endpoint, projectId, key, debug, reset }: ClientCommandOptions, command: Command) => {
-        if (selfSigned == undefined && endpoint == undefined && projectId == undefined && key == undefined && debug == undefined && reset == undefined) {
-            command.help()
+  .description(commandDescriptions["client"])
+  .configureHelp({
+    helpWidth: process.stdout.columns || 80,
+  })
+  .option(
+    "-ss, --self-signed <value>",
+    "Configure the CLI to use a self-signed certificate ( true or false )",
+    parseBool,
+  )
+  .option("-e, --endpoint <endpoint>", "Set your Appwrite server endpoint")
+  .option("-p, --project-id <project-id>", "Set your Appwrite project ID")
+  .option("-k, --key <key>", "Set your Appwrite server's API key")
+  .option("-d, --debug", "Print CLI debug information")
+  .option("-r, --reset", "Reset the CLI configuration")
+  .action(
+    actionRunner(
+      async (
+        {
+          selfSigned,
+          endpoint,
+          projectId,
+          key,
+          debug,
+          reset,
+        }: ClientCommandOptions,
+        command: Command,
+      ) => {
+        if (
+          selfSigned == undefined &&
+          endpoint == undefined &&
+          projectId == undefined &&
+          key == undefined &&
+          debug == undefined &&
+          reset == undefined
+        ) {
+          command.help();
         }
 
         if (debug) {
-            let config = {
-                endpoint: globalConfig.getEndpoint(),
-                key: globalConfig.getKey(),
-                cookie: globalConfig.getCookie(),
-                selfSigned: globalConfig.getSelfSigned(),
-                project: localConfig.getProject()
-            }
-            parse(config)
+          let config = {
+            endpoint: globalConfig.getEndpoint(),
+            key: globalConfig.getKey(),
+            cookie: globalConfig.getCookie(),
+            selfSigned: globalConfig.getSelfSigned(),
+            project: localConfig.getProject(),
+          };
+          parse(config);
         }
 
         if (endpoint !== undefined) {
-            try {
-                const id = ID.unique();
-                let url = new URL(endpoint);
-                if (url.protocol !== "http:" && url.protocol !== "https:") {
-                    throw new Error();
-                }
-
-                let clientInstance = new Client().setEndpoint(endpoint);
-                clientInstance.setProject('console');
-                if (selfSigned || globalConfig.getSelfSigned()) {
-                    clientInstance.setSelfSigned(true);
-                }
-                let response = await clientInstance.call('GET', '/health/version');
-                if (!response.version) {
-                    throw new Error();
-                }
-                globalConfig.setCurrentSession(id);
-                globalConfig.addSession(id, {});
-                globalConfig.setEndpoint(endpoint);
-            } catch (_) {
-                throw new Error("Invalid endpoint or your Appwrite server is not running as expected.");
+          try {
+            const id = ID.unique();
+            let url = new URL(endpoint);
+            if (url.protocol !== "http:" && url.protocol !== "https:") {
+              throw new Error();
+            }
+
+            let clientInstance = new Client().setEndpoint(endpoint);
+            clientInstance.setProject("console");
+            if (selfSigned || globalConfig.getSelfSigned()) {
+              clientInstance.setSelfSigned(true);
             }
+            let response = (await clientInstance.call(
+              "GET",
+              new URL(endpoint + "/health/version"),
+            )) as { version?: string };
+            if (!response.version) {
+              throw new Error();
+            }
+            globalConfig.setCurrentSession(id);
+            globalConfig.addSession(id, { endpoint });
+            globalConfig.setEndpoint(endpoint);
+          } catch (_) {
+            throw new Error(
+              "Invalid endpoint or your Appwrite server is not running as expected.",
+            );
+          }
         }
 
         if (key !== undefined) {
-            globalConfig.setKey(key)
+          globalConfig.setKey(key);
         }
 
         if (projectId !== undefined) {
-            localConfig.setProject(projectId, '');
+          localConfig.setProject(projectId, "");
         }
 
         if (selfSigned == true || selfSigned == false) {
-            globalConfig.setSelfSigned(selfSigned);
+          globalConfig.setSelfSigned(selfSigned);
         }
 
         if (reset !== undefined) {
-            const sessions = globalConfig.getSessions();
+          const sessions = globalConfig.getSessions();
 
-            for (let accountId of sessions.map((session: any) => session.id)) {
-                globalConfig.setCurrentSession(accountId);
-                await deleteSession(accountId);
-            }
+          for (let accountId of sessions.map((session: any) => session.id)) {
+            globalConfig.setCurrentSession(accountId);
+            await deleteSession(accountId);
+          }
         }
 
-        success("Setting client")
-    }));
+        success("Setting client");
+      },
+    ),
+  );
 
 export const migrate = async (): Promise<void> => {
-    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.addSession(id, data);
-    globalConfig.setCurrentSession(id);
-    globalConfig.delete('endpoint');
-    globalConfig.delete('cookie');
-}
-
+  if (!globalConfig.has("endpoint") || !globalConfig.has("cookie")) {
+    return;
+  }
+
+  const endpoint = globalConfig.get("endpoint") as string;
+  const cookie = globalConfig.get("cookie") as string;
+
+  const id = ID.unique();
+  const data = {
+    endpoint,
+    cookie,
+    email: "legacy",
+  };
+
+  globalConfig.addSession(id, data);
+  globalConfig.setCurrentSession(id);
+  globalConfig.delete("endpoint");
+  globalConfig.delete("cookie");
+};