More tests and small refactoring

Author: CodeF0x

lib/api-functions.js

@@ -1,12 +1,20 @@
-import inquirer from 'inquirer';
-import fetch from 'node-fetch';
-import { API_URLS, FORMAT_CHOICES } from './constant.js';
-import { readFileSync, rmSync, writeFileSync } from 'fs';
-import { homedir } from 'os';
-import { table } from 'table';
-import { getListTable, mapToVisiblityCode, tokenGuard } from './util.js';
-
-export async function loginUser(argv, apiToken) {
+const inquirer = require('inquirer');
+const fetch = require('node-fetch');
+const { API_URLS, FORMAT_CHOICES } = require('./constant.js');
+const { readFileSync, rmSync, writeFileSync, existsSync } = require('fs');
+const { homedir } = require('os');
+const { table } = require('table');
+const { getListTable, mapToVisiblityCode, tokenGuard } = require('./util.js');
+
+module.exports = {
+  loginUser,
+  listPastes,
+  logout,
+  deletePaste,
+  createPaste,
+};
+
+async function loginUser(argv, apiToken) {
   if (tokenGuard(apiToken)) {
     return 'Please provide your pastebin.com API token in the ~/.pasty.api file.';
   }
@@ -42,7 +50,7 @@ export async function loginUser(argv, apiToken) {
   }
 }
 
-export async function listPastes(amount, apiToken, userToken) {
+async function listPastes(amount, apiToken, userToken) {
   if (tokenGuard(apiToken)) {
     return 'Please provide your pastebin.com API token in the ~/.pasty.api file.';
   }
@@ -69,16 +77,23 @@ export async function listPastes(amount, apiToken, userToken) {
   }
 }
 
-export function logout() {
-  try {
+function logout() {
+  if (existsSync(`${homedir}/.pasty.user`)) {
     rmSync(`${homedir()}/.pasty.user`);
     return 'Successfully logged you out.';
-  } catch (e) {
-    return "You're currently not logged in";
   }
+  return "You're currently not logged in (could not find ~/.pasty.user)";
 }
 
-export async function deletePaste(pasteId, apiToken, userToken) {
+async function deletePaste(pasteId, apiToken, userToken) {
+  if (tokenGuard(apiToken)) {
+    return 'Please provide your pastebin.com API token in the ~/.pasty.api file.';
+  }
+
+  if (tokenGuard(userToken)) {
+    return 'Please login first via pasty login <username>';
+  }
+
   const response = await fetch(API_URLS.apiPost, {
     body: `api_dev_key=${apiToken}&api_user_key=${userToken}&api_option=delete&api_paste_key=${pasteId}`,
     headers: {
@@ -92,16 +107,26 @@ export async function deletePaste(pasteId, apiToken, userToken) {
   return response.status === 200 ? `Success! ${text}` : `Error! ${text}`;
 }
 
-export async function createPaste(argv, apiToken, userToken) {
+async function createPaste(argv, apiToken, userToken) {
+  if (tokenGuard(apiToken)) {
+    return 'Please provide your pastebin.com API token in the ~/.pasty.api file.';
+  }
+
+  if (tokenGuard(userToken)) {
+    return 'Please login first via pasty login <username>';
+  }
+
   const { file, string, format, visibility, expiry, folder, name } = argv;
 
-  if (format && !FORMAT_CHOICES.includes(format)) {
+  if (!FORMAT_CHOICES.includes(format)) {
     return 'Error! Format option is not supported by pastebin. See https://pastebin.com/doc_api#8 for supported formats';
   }
 
   const mappedVisibility = mapToVisiblityCode(visibility);
   const pasteText = file ? readFileSync(file, 'utf-8').trim() : string;
 
+  console.log(name, pasteText);
+
   const response = await fetch(API_URLS.apiPost, {
     body: `api_dev_key=${apiToken}&api_user_key=${userToken}&api_option=paste&api_paste_code=${pasteText}&api_paste_name=${name}&api_paste_format=${format}&api_paste_private=${mappedVisibility}`,
     headers: {
@@ -112,5 +137,5 @@ export async function createPaste(argv, apiToken, userToken) {
 
   const text = await response.text();
 
-  return response.status === 200 ? `Succes! ${text}` : `Error! ${text}`;
+  return response.status === 200 ? `Success! ${text}` : `Error! ${text}`;
 }