fix(amplify-provider-awscloudformation): display mfa prompt (aws-ampl…

…ify#7866) currently, the ora spinner is blocks the mfa prompt from appearing to the user. this commit makes sure a spinner is not running before prompting for mfa, then continues the spinner afterwords if required.
marcvberg · Aug 25, 2021 · 8947b18 · 8947b18
1 parent 61d4baa
commit 8947b18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/...mplify-category-function/src/provider-utils/awscloudformation/secrets/ssmClientWrapper.ts b/...mplify-category-function/src/provider-utils/awscloudformation/secrets/ssmClientWrapper.ts
@@ -102,6 +102,7 @@ export class SSMClientWrapper {
 
 const getSSMClient = async (context: $TSContext) => {
   const spinner = ora('Initializing SSM Client');
+  context.exeInfo.spinner = spinner;
   try {
     spinner.start();
 

diff --git a/packages/amplify-cli/src/commands/push.ts b/packages/amplify-cli/src/commands/push.ts
@@ -10,6 +10,7 @@ const spinner = ora('');
 // to push his local developments
 async function syncCurrentCloudBackend(context: $TSContext) {
   context.exeInfo.restoreBackend = false;
+  context.exeInfo.spinner = spinner;
 
   const currentEnv = context.exeInfo.localEnvInfo.envName;
 

diff --git a/packages/amplify-provider-awscloudformation/src/system-config-manager.ts b/packages/amplify-provider-awscloudformation/src/system-config-manager.ts
@@ -123,7 +123,7 @@ async function getRoleCredentials(context: $TSContext, profileName: string, prof
       context.print.info(`  ${profileConfig.role_arn}`);
       context.print.info('It requires MFA authentication. The MFA device is');
       context.print.info(`  ${profileConfig.mfa_serial}`);
-      mfaTokenCode = await getMfaTokenCode();
+      mfaTokenCode = await getMfaTokenCode(context);
     }
     logger('getRoleCredentials.aws.STS', [sourceProfileAwsConfig])();
     const sts = new aws.STS(sourceProfileAwsConfig);
@@ -156,7 +156,11 @@ async function getRoleCredentials(context: $TSContext, profileName: string, prof
   return roleCredentials;
 }
 
-async function getMfaTokenCode() {
+async function getMfaTokenCode(context) {
+  let spinner;
+  if (context.exeInfo.spinner && context.exeInfo.spinner.isSpinning) {
+    spinner = context.exeInfo.spinner.stopAndPersist();
+  }
   const inputMfaTokenCode = {
     type: 'input',
     name: 'tokenCode',
@@ -174,6 +178,7 @@ async function getMfaTokenCode() {
     },
   };
   const answer = await inquirer.prompt(inputMfaTokenCode);
+  if (spinner) spinner.start();
   return answer.tokenCode;
 }