Small refactoring

Author: CodeF0x

lib/api-functions.js

@@ -8,10 +8,7 @@ import { getListTable, mapToVisiblityCode, tokenGuard } from './util.js';
 
 export async function loginUser(argv, apiToken) {
   if (tokenGuard(apiToken)) {
-    console.log(
-      'Please provide your pastebin.com API token in the ~/.pasty.api file.'
-    );
-    process.exit(1);
+    return 'Please provide your pastebin.com API token in the ~/.pasty.api file.';
   }
 
   const username = argv.username;
@@ -34,27 +31,24 @@ export async function loginUser(argv, apiToken) {
     method: 'POST',
   });
 
+  // text is either the user token or an error from api
+  const text = await response.text();
+
   if (response.status === 200) {
-    const userToken = await response.text();
-    writeFileSync(`${homedir()}/.pasty.user`, userToken, 'utf-8');
-    console.log(`Success! You're now logged in as ${username}`);
+    writeFileSync(`${homedir()}/.pasty.user`, text, 'utf-8');
+    return `Success! You're now logged in as ${username}`;
   } else {
-    console.log(await response.text());
-    process.exit(1);
+    return `Error! ${text}`;
   }
 }
 
 export async function listPastes(amount, apiToken, userToken) {
   if (tokenGuard(apiToken)) {
-    console.log(
-      'Please provide your pastebin.com API token in the ~/.pasty.api file.'
-    );
-    process.exit(1);
+    return 'Please provide your pastebin.com API token in the ~/.pasty.api file.';
   }
 
   if (tokenGuard(userToken)) {
-    console.log('Please login first via pasty login <username>');
-    process.exit(1);
+    return 'Please login first via pasty login <username>';
   }
 
   const response = await fetch(API_URLS.apiPost, {
@@ -69,18 +63,18 @@ export async function listPastes(amount, apiToken, userToken) {
   if (response.status === 200) {
     const tableData = getListTable(text);
 
-    console.log(table(tableData));
+    return table(tableData);
   } else {
-    console.log(`Error! ${text}`);
+    return `Error! ${text}`;
   }
 }
 
 export function logout() {
   try {
     rmSync(`${homedir()}/.pasty.user`);
-    console.log('Successfully logged you out.');
+    return 'Successfully logged you out.';
   } catch (e) {
-    console.log("You're currently not logged in");
+    return "You're currently not logged in";
   }
 }
 
@@ -95,21 +89,14 @@ export async function deletePaste(pasteId, apiToken, userToken) {
 
   const text = await response.text();
 
-  if (response.status === 200) {
-    console.log(`Success! ${text}`);
-  } else {
-    console.log(`Error! ${text}`);
-  }
+  return response.status === 200 ? `Success! ${text}` : `Error! ${text}`;
 }
 
 export async function createPaste(argv, apiToken, userToken) {
   const { file, string, format, visibility, expiry, folder, name } = argv;
 
   if (format && !FORMAT_CHOICES.includes(format)) {
-    console.log(
-      'Error! Format option is not supported by pastebin. See https://pastebin.com/doc_api#8 for supported formats'
-    );
-    process.exit(1);
+    return 'Error! Format option is not supported by pastebin. See https://pastebin.com/doc_api#8 for supported formats';
   }
 
   const mappedVisibility = mapToVisiblityCode(visibility);
@@ -125,9 +112,5 @@ export async function createPaste(argv, apiToken, userToken) {
 
   const text = await response.text();
 
-  if (response.status === 200) {
-    console.log(text);
-  } else {
-    console.log(`Error! ${text}`);
-  }
+  return response.status === 200 ? `Succes! ${text}` : `Error! ${text}`;
 }

lib/main.js

@@ -36,8 +36,9 @@ yargs(hideBin(process.argv))
         describe: 'your username',
       });
     },
-    (argv) => {
-      loginUser(argv, apiToken);
+    async (argv) => {
+      const response = await loginUser(argv, apiToken);
+      console.log(response);
     }
   )
   .command(
@@ -49,8 +50,9 @@ yargs(hideBin(process.argv))
         describe: 'the amount of pastes to be displayed',
       });
     },
-    (argv) => {
-      listPastes(argv.amount, apiToken, userToken);
+    async (argv) => {
+      const response = await listPastes(argv.amount, apiToken, userToken);
+      console.log(response);
     }
   )
   .command(
@@ -61,13 +63,14 @@ yargs(hideBin(process.argv))
         describe: 'the id of the paste you want to delete',
       });
     },
-    (argv) => {
-      deletePaste(argv.pasteid, apiToken, userToken);
+    async (argv) => {
+      const response = await deletePaste(argv.pasteid, apiToken, userToken);
+      console.log(response);
     }
   )
   .command(
-    'post',
-    'post a paste. either from a file or a string',
+    'create',
+    'create a paste. either from a file or a string',
     (yargs) => {
       return yargs
         .option('f', {
@@ -106,16 +109,18 @@ yargs(hideBin(process.argv))
         })
         .conflicts('f', 's');
     },
-    (argv) => {
-      createPaste(argv, apiToken, userToken);
+    async (argv) => {
+      const response = await createPaste(argv, apiToken, userToken);
+      console.log(response);
     }
   )
   .command(
     'logout',
     'logs you out',
     () => {},
-    () => {
-      logout();
+    async () => {
+      const response = await logout();
+      console.log(response);
     }
   )
   .demandCommand(1)