Merge pull request #874 from appwrite/feat-general-improvements

Feat general improvements

Author: christyjacob4

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/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`)

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

@@ -18,9 +18,8 @@ const {
     questionsCreateCollection,
     questionsInitProject
 } = require("../questions");
-const { success, log, error, actionRunner, commandDescriptions } = require("../parser");
+const { success, log, error, actionRunner } = require("../parser");
 const { accountGet } = require("./account");
-const { loginCommand } = require("./generic");
 const { sdkForConsole } = require("../sdks");
 
 const initProject = async ({ organizationId, projectId, projectName } = {}) => {
@@ -37,8 +36,8 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
             sdk: client
         });
     } catch (e) {
-        log('You must login first')
-        await loginCommand();
+        error('Error Session not found. Please run `appwrite login` to create a session');
+        process.exit(1);
     }
 
     let answers = {};

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

@@ -344,8 +344,8 @@ const createAttribute = async (databaseId, collectionId, attribute) => {
                 collectionId,
                 key: attribute.key,
                 required: attribute.required,
-                min: attribute.min,
-                max: attribute.max,
+                min: parseInt(attribute.min.toString()),
+                max: parseInt(attribute.max.toString()),
                 xdefault: attribute.default,
                 array: attribute.array,
                 parseOutput: false
@@ -356,8 +356,8 @@ const createAttribute = async (databaseId, collectionId, attribute) => {
                 collectionId,
                 key: attribute.key,
                 required: attribute.required,
-                min: attribute.min,
-                max: attribute.max,
+                min: parseFloat(attribute.min.toString()),
+                max: parseFloat(attribute.max.toString()),
                 xdefault: attribute.default,
                 array: attribute.array,
                 parseOutput: false
@@ -481,7 +481,14 @@ const attributesToCreate = async (remoteAttributes, localAttributes, collection)
         return { Key: change.key, Action: change.action, Reason: change.reason, };
     }));
 
-    if (!cliConfig.force) {
+    if (!cliConfig.force && (deleting.length > 0 || conflicts.length > 0)) {
+        if (deleting.length > 0) {
+            log(`Attribute deletion will cause ${chalk.red('loss of data')}`);
+        }
+        if (conflicts.length > 0) {
+            log(`Attribute recreation will cause ${chalk.red('loss of data')}`);
+        }
+
         const answers = await inquirer.prompt(questionsPushCollections[1]);
 
         if (answers.changes.toLowerCase() !== 'yes') {
@@ -932,7 +939,18 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
         error(`Deployment of ${name} has failed. Check at ${failUrl} for more details\n`);
     })
 
-    success(`Pushed ${successfullyPushed} functions with ${successfullyDeployed} successful deployments.`);
+    let message = chalk.green(`Pushed and deployed ${successfullyPushed} functions`);
+
+    if (!async) {
+        if (successfullyDeployed < successfullyPushed) {
+            message = `${chalk.green(`Pushed and deployed ${successfullyPushed} functions.`)} ${chalk.red(`${successfullyPushed - successfullyDeployed}  failed to deploy`)}`;
+        } else {
+            if (successfullyPushed === 0) {
+                message = chalk.red(`Error pushing ${functions.length} functions`)
+            }
+        }
+    }
+    log(message);
 }
 
 const pushCollection = async ({ returnOnZero } = { returnOnZero: false }) => {
@@ -1034,7 +1052,7 @@ const pushCollection = async ({ returnOnZero } = { returnOnZero: false }) => {
         }
     }))
 
-// Serialize attribute actions
+    // Serialize attribute actions
     for (let collection of collections) {
         let attributes = collection.attributes;
 

templates/cli/lib/parser.js.twig

@@ -151,6 +151,7 @@ const parseError = (err) => {
         if (cliConfig.verbose) {
             console.error(err);
         } else {
+            log('For detailed error pass the --verbose or --report flag');
             error(err.message);
         }
         process.exit(1);

templates/cli/lib/questions.js.twig

@@ -628,7 +628,7 @@ const questionsPushCollections = [
     {
         type: "input",
         name: "changes",
-        message: `Are you sure you want to override this collection? This can lead to loss of data! Type "YES" to confirm.`
+        message: `Would you like to apply these changes? Type "YES" to confirm.`
     }
 ]
 

templates/cli/lib/sdks.js.twig

@@ -68,7 +68,7 @@ const sdkForProject = async () => {
   }
 
   if (!project) {
-    throw new Error("Project is not set. Please run `{{ language.params.executableName }} pull project` to initialize the current directory with an {{ spec.title|caseUcfirst }} project.");
+    throw new Error("Project is not set. Please run `{{ language.params.executableName }} init` to initialize the current directory with an {{ spec.title|caseUcfirst }} project.");
   }
 
   client

templates/cli/lib/utils.js.twig

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const { localConfig, globalConfig } = require("./config");
-const { success, log } = require('./parser')
+const { success, log, error } = require('./parser')
 const readline = require('readline');
 const cp = require('child_process');
 
@@ -67,7 +67,13 @@ function showConsoleLink(serviceName, action, open, ...ids) {
 
     if (open) {
         const start = (process.platform == 'darwin' ? 'open' : process.platform == 'win32' ? 'start' : 'xdg-open');
-        cp.exec(`${start} ${url}`);
+
+        cp.exec(`${start} ${url}`, (err, stdout, stderr) => {
+            if (err !== null) {
+                console.log('\n');
+                error('Opening in default browser. ' + err)
+            }
+        });
     }
 }