Merge branch 'refs/heads/feat-console-flow' into feat-multiple-accounts-and-instances

Author: byawitz

templates/cli/index.js.twig

@@ -35,7 +35,7 @@ program
   .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")
+  .option("--report", "Enable reporting in case of CLI errors")
   .on("option:json", () => {
     cliConfig.json = true;
   })

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

@@ -47,8 +47,7 @@ const pullProject = async () => {
 
         })
 
-        localConfig.setProject(response.$id, response.name);
-        localConfig.setProjectSettings(response);
+        localConfig.setProject(response.$id, response.name, response);
 
         success();
     } catch (e) {

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

@@ -587,18 +587,18 @@ const pushProject = async () => {
         const projectId = localConfig.getProject().projectId;
         const projectName = localConfig.getProject().projectName;
 
-        log('Updating project name');
+        log(`Updating project ${projectName} ( ${projectId} )`);
 
         await projectsUpdate({
             projectId,
             name: projectName,
             parseOutput: false
         });
 
-        const settings = localConfig.getProjectSettings();
+        const settings = localConfig.getProject().projectSettings;
 
         if (settings.services) {
-            log('Updating services status');
+            log('Updating service statuses');
             for (let [service, status] of Object.entries(settings.services)) {
                 await projectsUpdateServiceStatus({
                     projectId,
@@ -611,7 +611,7 @@ const pushProject = async () => {
 
         if (settings.auth) {
             if (settings.auth.security) {
-                log('Updating Auth security settings');
+                log('Updating auth security settings');
                 await projectsUpdateAuthDuration({ projectId, duration: settings.auth.security.duration, parseOutput: false });
                 await projectsUpdateAuthLimit({ projectId, limit: settings.auth.security.limit, parseOutput: false });
                 await projectsUpdateAuthSessionsLimit({ projectId, limit: settings.auth.security.sessionsLimit, parseOutput: false });
@@ -621,7 +621,7 @@ const pushProject = async () => {
             }
 
             if (settings.auth.methods) {
-                log('Updating Auth available login methods');
+                log('Updating auth login methods');
 
                 for (let [method, status] of Object.entries(settings.auth.methods)) {
                     await projectsUpdateAuthStatus({

templates/cli/lib/config.js.twig

@@ -329,62 +329,53 @@ class Local extends Config {
         return {
             projectId: this.get("projectId"),
             projectName: this.get("projectName"),
+            projectSettings: this.get('projectSettings')
         };
     }
 
-    setProject(projectId, projectName) {
+    setProject(projectId, projectName, projectSettings = {}) {
         this.set("projectId", projectId);
         this.set("projectName", projectName);
-    }
-
-
-    getProjectSettings() {
-        if (!this.has("projectSettings")) {
-            return {};
-        }
-
-        return this.get('projectSettings')
-    }
 
-    setProjectSettings(project) {
         const settings = {
             services: {
-                account: project.serviceStatusForAccount,
-                avatars: project.serviceStatusForAvatars,
-                databases: project.serviceStatusForDatabases,
-                locale: project.serviceStatusForLocale,
-                health: project.serviceStatusForHealth,
-                storage: project.serviceStatusForStorage,
-                teams: project.serviceStatusForTeams,
-                users: project.serviceStatusForUsers,
-                functions: project.serviceStatusForFunctions,
-                graphql: project.serviceStatusForGraphql,
-                messaging: project.serviceStatusForMessaging,
+                account: projectSettings.serviceStatusForAccount,
+                avatars: projectSettings.serviceStatusForAvatars,
+                databases: projectSettings.serviceStatusForDatabases,
+                locale: projectSettings.serviceStatusForLocale,
+                health: projectSettings.serviceStatusForHealth,
+                storage: projectSettings.serviceStatusForStorage,
+                teams: projectSettings.serviceStatusForTeams,
+                users: projectSettings.serviceStatusForUsers,
+                functions: projectSettings.serviceStatusForFunctions,
+                graphql: projectSettings.serviceStatusForGraphql,
+                messaging: projectSettings.serviceStatusForMessaging,
 
             },
             auth: {
                 methods: {
-                    jwt: project.authJWT,
-                    phone: project.authPhone,
-                    invites: project.authInvites,
-                    anonymous: project.authAnonymous,
-                    "email-otp": project.authEmailOtp,
-                    "magic-url": project.authUsersAuthMagicURL,
-                    "email-password": project.authEmailPassword
+                    jwt: projectSettings.authJWT,
+                    phone: projectSettings.authPhone,
+                    invites: projectSettings.authInvites,
+                    anonymous: projectSettings.authAnonymous,
+                    "email-otp": projectSettings.authEmailOtp,
+                    "magic-url": projectSettings.authUsersAuthMagicURL,
+                    "email-password": projectSettings.authEmailPassword
                 },
                 security: {
-                    duration: project.authDuration,
-                    limit: project.authLimit,
-                    sessionsLimit: project.authSessionsLimit,
-                    passwordHistory: project.authPasswordHistory,
-                    passwordDictionary: project.authPasswordDictionary,
-                    personalDataCheck: project.authPersonalDataCheck
+                    duration: projectSettings.authDuration,
+                    limit: projectSettings.authLimit,
+                    sessionsLimit: projectSettings.authSessionsLimit,
+                    passwordHistory: projectSettings.authPasswordHistory,
+                    passwordDictionary: projectSettings.authPasswordDictionary,
+                    personalDataCheck: projectSettings.authPersonalDataCheck
                 }
             }
         };
 
         this.set('projectSettings', settings)
     }
+
 }
 
 class Global extends Config {

templates/cli/lib/paginate.js.twig

@@ -5,15 +5,10 @@ const paginate = async (action, args = {}, limit = 100, wrapper = '') => {
 
     while (true) {
         const offset = pageNumber * limit;
-        const additionalQueries = [];
-        if (args.queries) {
-            additionalQueries.push(...args.queries);
-        }
         // Merge the limit and offset into the args
         const response = await action({
             ...args,
             queries: [
-                ...additionalQueries,
                 JSON.stringify({ method: 'limit', values: [limit] }),
                 JSON.stringify({ method: 'offset', values: [offset] })
             ]

templates/cli/lib/parser.js.twig

@@ -4,6 +4,7 @@ const Table = require('cli-table3');
 const { description } = require('../package.json');
 const { globalConfig } = require("./config.js");
 const os = require('os');
+const Client = require("./client");
 
 const cliConfig = {
     verbose: false,
@@ -120,12 +121,13 @@ const parseError = (err) => {
     if (cliConfig.report) {
         (async () => {
             let appwriteVersion = 'unknown';
-            const isCloud = globalConfig.getEndpoint().includes('cloud.appwrite.io') ? 'Yes' : 'No';
+            const endpoint = globalConfig.getEndpoint();
+            const isCloud = endpoint.includes('cloud.appwrite.io') ? 'Yes' : 'No';
 
             try {
-                const res = await fetch(`${globalConfig.getEndpoint()}/health/version`);
-                const json = await res.json();
-                appwriteVersion = json.version;
+                const client = new Client().setEndpoint(endpoint);
+                const res = await client.call('get', '/health/version');
+                appwriteVersion = res.version;
             } catch {
             }
 
@@ -145,6 +147,9 @@ const parseError = (err) => {
 
             log(`To report this error you can:\n - Create a support ticket in our Discord server https://appwrite.io/discord \n - Create an issue in our Github\n   ${githubIssueUrl.href}\n`);
 
+
+            error('\n Stack Trace: \n');
+            console.error(err);
             process.exit(1);
         })()
     } else {