refactor(cli): Multiple account login refactoring

Author: byawitz

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

@@ -140,31 +140,6 @@ const login = new Command("login")
     })
     .action(actionRunner(loginCommand));
 
-login
-    .command('list')
-    .description("List available logged accounts.")
-    .option("-j, --json", "Output in JSON format")
-    .action(actionRunner(async ({ json }) => {
-        const logins = globalConfig.getLogins();
-        const current = globalConfig.getCurrentLogin();
-
-        const data = [...logins.map((login => {
-            return {
-                'Current': login.id === current ? '*' : '',
-                'ID': login.id,
-                'Email': login.email,
-                'Endpoint': login.endpoint
-            };
-        }))];
-
-        if (json) {
-            console.log(data);
-            return;
-        }
-        drawTable(data);
-
-    }));
-
 const singleLogout = async (accountId) => {
     try {
         let client = await sdkForConsole();
@@ -202,19 +177,12 @@ const logout = new Command("logout")
         }
 
         const answers = await inquirer.prompt(questionsLogout);
-        const accountIds = [];
-
-        if (answers.method === 'all') {
-            accountIds.push(...logins.map(login => login.id));
-        }
-
-        if (answers.method === 'selected' && answers.accounts) {
-            accountIds.push(...answers.accounts);
-        }
 
-        for (let accountId of accountIds) {
-            globalConfig.setCurrentLogin(accountId);
-            await singleLogout(accountId);
+        if (answers.accounts) {
+            for (let accountId of answers.accounts) {
+                globalConfig.setCurrentLogin(accountId);
+                await singleLogout(accountId);
+            }
         }
 
         const leftLogins = globalConfig.getLogins();

templates/cli/lib/questions.js.twig

@@ -326,60 +326,50 @@ const questionsLogin = [
 
             const data = [];
 
-            const longestEmail = logins.reduce((prev, current) => (prev && prev.email > current.email) ? prev : current).email.length;
+            const longestEmail = logins.reduce((prev, current) => (prev && (prev.email ?? '').length > (current.email ?? '').length) ? prev : current).email.length;
 
             logins.forEach((login) => {
-                data.push({
-                    value: login.id,
-                    name: `${login.email.padEnd(longestEmail)} ${current === login.id ? chalk.green.bold('In use') : ' '.repeat(6)} ${login.endpoint}`,
-                });
+                if (login.email) {
+                    data.push({
+                        current: current === login.id,
+                        value: login.id,
+                        name: `${login.email.padEnd(longestEmail)} ${current === login.id ? chalk.green.bold('current') : ' '.repeat(6)} ${login.endpoint}`,
+                    });
+                }
             })
 
-            return data;
+            return data.sort((a, b) => Number(b.current) - Number(a.current))
         },
         when: (answers) => answers.method === 'select'
     },
 
 ];
 
 const questionsLogout = [
-    {
-        type: "list",
-        name: "method",
-        message: "Which account would you like to logout from?",
-        choices() {
-            const logins = globalConfig.getLogins();
-
-            return [
-                { name: 'Account in use' },
-                { name: 'Selected accounts', value: 'selected' },
-                { name: 'All accounts', value: 'all' }
-            ];
-        },
-        when: () => globalConfig.getCurrentLogin() !== ''
-    },
     {
         type: "checkbox",
         name: "accounts",
         message: "Select accounts to logout from",
-        when: (answers) => answers.method === 'selected',
         validate: (value) => validateRequired('account', value),
         choices() {
             const logins = globalConfig.getLogins();
             const current = globalConfig.getCurrentLogin();
 
             const data = [];
 
-            const longestEmail = logins.reduce((prev, current) => (prev && prev.email > current.email) ? prev : current).email.length;
+            const longestEmail = logins.reduce((prev, current) => (prev && (prev.email ?? '').length > (current.email ?? '').length) ? prev : current).email.length;
 
             logins.forEach((login) => {
-                data.push({
-                    value: login.id,
-                    name: `${login.email.padEnd(longestEmail)} ${current === login.id ? chalk.green.bold('In use') : ' '.repeat(6)} ${login.endpoint}`,
-                });
+                if (login.email) {
+                    data.push({
+                        current: current === login.id,
+                        value: login.id,
+                        name: `${login.email.padEnd(longestEmail)} ${current === login.id ? chalk.green.bold('current') : ' '.repeat(6)} ${login.endpoint}`,
+                    });
+                }
             })
 
-            return data;
+            return data.sort((a, b) => Number(b.current) - Number(a.current))
         }
     }
 ];