Fix: Moved the OTP asking to catch block

Author: cs-raj

.talismanrc

@@ -1,6 +1,6 @@
 fileignoreconfig:
   - filename: package-lock.json
-    checksum: 21d5e66a045c155578dc6b6d747745b94c4591c1e17f5226b94b833a46ee9bff
+    checksum: 402af4afadadbabb915ddaf099cbe0bd94dc571926db4e65d7c44f9d85240e62
   - filename: pnpm-lock.yaml
     checksum: a0e789a97a39aece1d637ed121bb6847d39dfb9033b71ea8bf10619eec2e246a
   - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {

packages/contentstack-auth/package.json

@@ -118,9 +118,11 @@ class AuthHandler {
             if (result.user) {
               log.debug('Login successful, user found', { module: 'auth-handler', userEmail: result.user.email });
               resolve(result.user as User);
-            } else if (result.error_code === 294) {
+            }
+          })
+          .catch(async (error: any) => {
+            if (error.errorCode === 294) {
               const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
-
               try {
                 resolve(await this.login(email, password, tfToken));
               } catch (error) {
@@ -129,14 +131,12 @@ class AuthHandler {
                 reject(error);
               }
             } else {
-              log.debug('Login failed: no user found.', { module: 'auth-handler', result });
+              log.debug('Login failed: no user found.', { module: 'auth-handler', error });
               reject(new Error(messageHandler.parse('CLI_AUTH_LOGIN_NO_USER')));
+              log.debug('Login API call failed.', { module: 'auth-handler', error: error?.errorMessage || error });
+              cliux.print('CLI_AUTH_LOGIN_FAILED', { color: 'yellow' });
+              handleAndLogError(error, { module: 'auth-handler' });
             }
-          })
-          .catch((error: any) => {
-            log.debug('Login API call failed.', { module: 'auth-handler', error: error?.errorMessage || error });
-            cliux.print('CLI_AUTH_LOGIN_FAILED', { color: 'yellow' });
-            handleAndLogError(error, { module: 'auth-handler' });
           });
       } else {
         const hasEmail = !!email;

packages/contentstack-auth/src/utils/auth-handler.ts

@@ -87,20 +87,6 @@ class MFAHandler {
       }
     }
 
-    if (!secret) {
-      log.debug('Checking stored MFA secret', { module: 'mfa-handler' });
-      const mfaConfig = configHandler.get('mfa');
-      if (mfaConfig?.secret) {
-        try {
-          secret = this.encrypter.decrypt(mfaConfig.secret);
-          source = 'stored configuration';
-        } catch (error) {
-          log.debug('Failed to decrypt stored MFA secret', { module: 'mfa-handler', error });
-          handleAndLogError(error, { module: 'mfa-handler' }, messageHandler.parse('CLI_AUTH_MFA_DECRYPT_FAILED'));
-        }
-      }
-    }
-
     if (secret) {
       try {
         const code = this.generateMFACode(secret);

packages/contentstack-auth/src/utils/mfa-handler.ts

@@ -21,7 +21,7 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "~1.7.0",
+    "@contentstack/cli-auth": "~1.7.1",
     "@contentstack/cli-config": "~1.17.0",
     "@contentstack/cli-dev-dependencies": "~1.3.1",
     "@oclif/plugin-help": "^6.2.28",

packages/contentstack-export/package.json

@@ -25,7 +25,7 @@
     "@contentstack/cli-audit": "~1.17.0",
     "@contentstack/cli-cm-export": "~1.23.0",
     "@contentstack/cli-cm-import": "~1.31.0",
-    "@contentstack/cli-auth": "~1.7.0",
+    "@contentstack/cli-auth": "~1.7.1",
     "@contentstack/cli-cm-bootstrap": "~1.18.0",
     "@contentstack/cli-cm-branches": "~1.6.2",
     "@contentstack/cli-cm-bulk-publish": "~1.10.5",