✂️ Refactored & Added file and services

Author: junip

.eslintrc.js

@@ -4,12 +4,4 @@ module.exports = {
     commonjs: true,
     es2021: true,
   },
-  // extends: [
-  //   'airbnb-base',
-  // ],
-  // parserOptions: {
-  //   ecmaVersion: 12,
-  // },
-  // rules: {
-  // },
 };

package.json

@@ -45,6 +45,7 @@
     "assets": "./node_modules/figlet/fonts/Standard.flf"
   },
   "dependencies": {
+    "axios": "^0.24.0",
     "chalk": "^2.4.2",
     "commander": "^8.2.0",
     "configstore": "^4.0.0",
@@ -54,7 +55,7 @@
     "inquirer": "^6.3.1",
     "inquirer-autocomplete-prompt": "^1.4.0",
     "jira-connector": "^3.1.0",
-    "jira.js": "^2.5.1",
+    "jira.js": "^2.8.0",
     "log-update": "^3.2.0",
     "minimist": "^1.2.0",
     "open": "^8.2.1",

src/api/board.js

@@ -5,7 +5,7 @@
 const fuzzy = require('fuzzy');
 const inquirer = require('inquirer');
 const autocompletePrompt = require('inquirer-autocomplete-prompt');
-const authenticate = require('../authentication');
+const authService = require('../services/AuthServices');
 inquirer.registerPrompt('autocomplete', autocompletePrompt);
 const store = require('../store');
 const log = require('../utility/console');
@@ -16,7 +16,7 @@ let names = [];
 module.exports = {
     getBoards() {
         spinner.start();
-        authenticate.jiraConnector().board.getAllBoards({}, (err, response) => {
+        authService.jiraConnector().board.getAllBoards({}, (err, response) => {
             if (response) {
                 spinner.stop();
                 names = response.values.map(el => el.name);

src/authentication.js

@@ -4,6 +4,7 @@ const program = require('commander');
 const input = require('./store');
 
 const { loadBoardCommands } = require('./commands/boards');
+const { loadTasksCommands } = require('./commands/tasks')
 
 program.version('1.0.0').description('CLI Tool for accessing JIRA');
 program
@@ -22,4 +23,6 @@ program
 
 // Add other sub commands here
 loadBoardCommands();
+loadTasksCommands();
+
 program.parse(process.argv);

src/index.js

@@ -0,0 +1,92 @@
+/**
+ * Authentication Module
+ * -------------------------------------------------------------
+ * return the jiraAuth BASE object and then we can call the apis
+ * on the base of the main object.
+ */
+ const Configstore = require('configstore');
+ const configStore = new Configstore('jiraconfig');
+ const { Version2Client } = require('jira.js');
+ const jiraConnector = require('jira-connector');
+ const emailAddress = configStore.get('emailAddress');
+ const apiToken = configStore.get('apiToken');
+ const hostname = configStore.get('hostname');
+ 
+ module.exports = {
+     /**
+      * Config Object contains the username, hostname and API token
+      * @param {*} config
+      */
+     authenticate(config, callback) {
+         const HOST_NAME = config.host_name;
+         let client = new Version2Client({
+             host: `https://${config.host_name}`,
+             authentication: {
+                 basic: {
+                     email: config.user_name,
+                     apiToken: config.api_token
+                 }
+             }
+         });
+ 
+         client.myself
+             .getCurrentUser()
+             .then(user => {
+                 if (user) {
+                     return callback({
+                         user,
+                         url: `https://${config.host_name}`,
+                         hostname: HOST_NAME,
+                         apiToken: config.api_token
+                     });
+                 }
+             })
+             .catch(err => {
+                 return callback({ error: 'UnAuthorized' });
+             });
+     },
+ 
+     /**
+      * Returns the recently authenticated user JIRA-Connector Object
+      * JIRA.js
+      */
+     jira() {
+         const emailAddress = configStore.get('emailAddress');
+         const apiToken = configStore.get('apiToken');
+         const hostUrl = configStore.get('url');
+         if (!apiToken) {
+             console.log('Please login using your API Token');
+         } else {
+             const JIRA_CONFIG = new Version2Client({
+                 host: hostUrl,
+                 authentication: {
+                     basic: {
+                         email: emailAddress,
+                         apiToken: apiToken
+                     }
+                 }
+             });
+             return JIRA_CONFIG;
+         }
+     },
+ 
+     /**
+      * Returns the recently authenticated jira Object
+      * JIRA -CONNECTOR
+      */
+     jiraConnector() {
+         if (!apiToken) {
+             console.log('Please login using your API Token');
+         } else {
+             const jira = new jiraConnector({
+                 host: hostname,
+                 basic_auth: {
+                     email: emailAddress,
+                     api_token: apiToken
+                 }
+             });
+             return jira;
+         }
+     }
+ };
+ 

src/services/AuthServices.js

@@ -0,0 +1,36 @@
+const Configstore = require('configstore');
+const configStore = new Configstore('jiraconfig');
+const axios = require('axios');
+const emailAddress = configStore.get('emailAddress');
+const apiToken = configStore.get('apiToken');
+const hostname = configStore.get('hostname');
+
+// encode email and token for basic auth as per JIRA authentications
+const encodeEmailToken = Buffer.from(`${emailAddress}:${apiToken}`).toString('base64')
+
+const instance = axios.create({
+    baseURL: `https://${hostname}`,
+    headers: {
+      'Authorization':  `Basic ${encodeEmailToken}`,
+      'Cache-Control': 'no-cache',
+    },  
+})
+
+
+instance.interceptors.request.use(function (config) {
+    return config;
+  }, function (error) {
+    return Promise.reject(error);
+});
+
+axios.interceptors.response.use(function (response) {
+    // Any status code that lie within the range of 2xx cause this function to trigger
+    // Do something with response data
+    return response;
+  }, function (error) {
+    // Any status codes that falls outside the range of 2xx cause this function to trigger
+    // Do something with response error
+    return Promise.reject(error);
+});
+
+module.exports = instance

src/services/AxiosService.js

@@ -5,13 +5,14 @@
  */
 
 const Configstore = require('configstore');
+const configStore = new Configstore('jiraconfig');
 // apis
-const jira = require('./authentication');
+const authService = require('./services/AuthServices');
 const print = require('./utility/console');
 const question = require('./api/questions');
 const util = require('./utility/utils');
 
-const configStore = new Configstore('jiraconfig');
+
 const spinner = util.spinner('Authenticating...');
 /**
  * Verify the user and save the object
@@ -32,7 +33,7 @@ module.exports = {
 
     verifyAndSave: config => {
         // authenticate and save the inputs in config store
-        jira.authenticate(config, data => {
+        authService.authenticate(config, data => {
             if (data) {
                 spinner.stop();
             }