Fix: Fixed the 2FA issue

Author: cs-raj

package-lock.json

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

packages/contentstack-auth/package.json

@@ -118,25 +118,26 @@ 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) {
-              const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
-
+            } else {
+              log.debug('Login failed: no user found.', { module: 'auth-handler', result });
+              reject(new Error(messageHandler.parse('CLI_AUTH_LOGIN_NO_USER')));
+            }
+          })
+          .catch(async (error: any) => {
+            if (error.errorCode === 294) {
               try {
+                const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
                 resolve(await this.login(email, password, tfToken));
               } catch (error) {
                 log.debug('Login with TFA token failed.', { module: 'auth-handler', error });
                 cliux.print('CLI_AUTH_2FA_FAILED', { color: 'red' });
                 reject(error);
               }
             } else {
-              log.debug('Login failed: no user found.', { module: 'auth-handler', result });
-              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' });
+              reject(error);
             }
-          })
-          .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;
@@ -203,7 +204,7 @@ class AuthHandler {
           .catch((error: Error) => {
             log.debug('Token validation failed.', { module: 'auth-handler', error: error.message });
             cliux.print('CLI_AUTH_TOKEN_VALIDATION_FAILED', { color: 'yellow' });
-            handleAndLogError(error, { module: 'auth-handler' });
+            reject(error);
           });
       } else {
         log.debug('Token validation failed: no auth token provided.', { module: 'auth-handler' });
@@ -213,4 +214,4 @@ class AuthHandler {
   }
 }
 
-export default new AuthHandler();
+export default new AuthHandler();

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": "~2.0.0-beta.1",
+    "@contentstack/cli-auth": "~2.0.0-beta.3",
     "@contentstack/cli-config": "~1.18.0",
     "@contentstack/cli-dev-dependencies": "~1.3.1",
     "@oclif/plugin-help": "^6.2.28",

packages/contentstack-export/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-audit": "~2.0.0-beta.2",
-    "@contentstack/cli-auth": "~2.0.0-beta.2",
+    "@contentstack/cli-auth": "~2.0.0-beta.3",
     "@contentstack/cli-cm-bootstrap": "~2.0.0-beta.4",
     "@contentstack/cli-cm-branches": "~1.6.3",
     "@contentstack/cli-cm-bulk-publish": "~1.10.6",