revert auth changes

Author: harshitha-cstk

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

@@ -118,26 +118,25 @@ class AuthHandler {
             if (result.user) {
               log.debug('Login successful, user found', { module: 'auth-handler', userEmail: result.user.email });
               resolve(result.user as User);
-            } 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) {
+            } else if (result.error_code === 294) {
+              const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
+
               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 API call failed.', { module: 'auth-handler', error: error?.errorMessage || error });
-              cliux.print('CLI_AUTH_LOGIN_FAILED', { color: 'yellow' });
-              reject(error);
+              log.debug('Login failed: no user found.', { module: 'auth-handler', result });
+              reject(new Error(messageHandler.parse('CLI_AUTH_LOGIN_NO_USER')));
             }
+          })
+          .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;
@@ -204,7 +203,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' });
-            reject(error);
+            handleAndLogError(error, { module: 'auth-handler' });
           });
       } else {
         log.debug('Token validation failed: no auth token provided.', { module: 'auth-handler' });

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

@@ -87,6 +87,20 @@ 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);