Refactor MFA entry to be used with different token functions

src/CLIMain.js

@@ -16,7 +16,7 @@ import {
 } from "./services/processEventLogs";
 import { getLogEvents } from "./services/awsCloudwatchLogs";
 import checkForUpdates from "./utils/updateNotifier";
-import { getAWSCredentials } from "./services";
+import { getAWSCredentialsHQ } from "./services";
 
 import {
   eventRegistryModal,
@@ -188,7 +188,7 @@ class Main {
   }
 
   init() {
-    const creds = getAWSCredentials(this.program.profile);
+    const creds = getAWSCredentialsHQ(this.program.profile, this.screen);
 
     return creds
       .getPromise()

src/services/awsCredentials.js

@@ -2,20 +2,18 @@ import AWS from "aws-sdk";
 
 import { promptMfaModal } from "../modals";
 
-function getMfaToken(serial, callback) {
-  promptMfaModal(callback, this.screen);
-}
-
-function getAWSCredentials(profile) {
+function getAWSCredentials(
+  profile,
+  tokenFn = () => console.error("In-tool MFA not supported for Guardian")
+) {
   if (profile) {
     process.env.AWS_SDK_LOAD_CONFIG = 1;
     return new AWS.SharedIniFileCredentials({
       profile,
-      tokenCodeFn: getMfaToken,
+      tokenCodeFn: tokenFn,
       callback: (err) => {
         if (err) {
           console.error(`SharedIniFileCreds Error: ${err}`);
-          process.exit(0);
         }
       },
     });
@@ -30,18 +28,26 @@ function getAWSCredentials(profile) {
   if (process.env.AWS_PROFILE) {
     return new AWS.SharedIniFileCredentials({
       profile: process.env.AWS_PROFILE,
-      tokenCodeFn: getMfaToken,
+      tokenCodeFn: tokenFn,
       callback: (err) => {
         if (err) {
           console.error(`SharedIniFileCreds Error: ${err}`);
-          process.exit(0);
         }
       },
     });
   }
   return new AWS.SharedIniFileCredentials({ profile: "default" });
 }
 
+function generateTokenFn(screen) {
+  return (serial, callback) => promptMfaModal(callback, screen);
+}
+
+function getAWSCredentialsHQ(profile, screen) {
+  getAWSCredentials(profile, generateTokenFn(screen));
+}
+
 module.exports = {
   getAWSCredentials,
+  getAWSCredentialsHQ,
 };

src/services/index.js

@@ -1,3 +1,3 @@
-export { getAWSCredentials } from "./awsCredentials";
+export { getAWSCredentials, getAWSCredentialsHQ } from "./awsCredentials";
 export { getStackResources } from "./stackResources";
 export { getLambdaFunctions } from "./awsLambda";