Integration Test fixes and unit test fixes

Author: cs-raj

.talismanrc

@@ -45,4 +45,6 @@ fileignoreconfig:
   checksum: b560bf300a07b40d9c24534c8e3493b7569233de061cfcdd58eb615c96e83d75
 - filename: packages/contentstack-auth/test/integration/auth.test.ts
   checksum: 96a66c141cf8f83443f967f62be210c3a95e06cf3d6c7bcb25229a4de7f05c5f
+- filename: packages/contentstack-auth/test/unit/commands/login.test.ts
+  checksum: c756628a3f814340035a97fbb0dbabdf5e20b9557e63e6a77138f661e3e234d5
 version: "1.0"

packages/contentstack-auth/test/integration/auth.test.ts

@@ -1,7 +1,14 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
-import { authHandler, interactive } from '../../src/utils';
-import { configHandler, cliux } from '@contentstack/cli-utilities';
+import { authHandler, interactive, totpHandler } from '../../src/utils';
+import { 
+  configHandler, 
+  cliux, 
+  messageHandler,
+  authHandler as oauthHandler,
+  CLIError
+} from '@contentstack/cli-utilities';
+import * as managementSDK from '@contentstack/cli-utilities';
 import { Helper } from './helper';
 
 const config = configHandler;
@@ -11,24 +18,48 @@ const TFATestToken = '24563992';
 
 describe('contentstack-auth plugin test', () => {
   let sandbox: sinon.SinonSandbox;
+  let mockClient: {
+    login: sinon.SinonStub;
+    logout: sinon.SinonStub;
+    getUser: sinon.SinonStub;
+  };
 
   beforeEach(() => {
     sandbox = sinon.createSandbox();
 
-    // Stub interactive prompts
+    // Interactive prompts
     sandbox.stub(interactive, 'askUsername').resolves(credentials.email);
     sandbox.stub(interactive, 'askPassword').resolves(credentials.password);
-    sandbox.stub(interactive, 'askOTPChannel').resolves('authy');
+    sandbox.stub(interactive, 'askOTPChannel').resolves('authenticator_app');
     sandbox.stub(interactive, 'askOTP').resolves(TFATestToken);
 
-    // Stub cliux
+    // CLI UI
     sandbox.stub(cliux, 'success');
     sandbox.stub(cliux, 'error');
     sandbox.stub(cliux, 'inquire').resolves(credentials.email);
 
-    // Stub config
+    // Config
     sandbox.stub(config, 'set');
     sandbox.stub(config, 'get').returns(credentials.email);
+
+    // Management SDK Client
+    mockClient = {
+      login: sandbox.stub().resolves({ user: { email: credentials.email, authtoken: 'test-token' } }),
+      logout: sandbox.stub().resolves({}),
+      getUser: sandbox.stub().resolves({ email: credentials.email })
+    };
+    sandbox.stub(managementSDK, 'managementSDKClient').resolves(mockClient);
+    authHandler.client = mockClient;
+
+    // TOTP Handler
+    sandbox.stub(totpHandler, 'getTOTPCode').resolves(TFATestToken);
+
+    // OAuth Handler
+    sandbox.stub(oauthHandler, 'setConfigData').resolves();
+    sandbox.stub(oauthHandler, 'host').value('https://api.contentstack.io');
+
+    // Message Handler
+    sandbox.stub(messageHandler, 'parse').returns('Successfully logged in!!');
   });
 
   afterEach(() => {
@@ -64,33 +95,37 @@ describe('contentstack-auth plugin test', () => {
   });
 
   describe('Check auth:login command with 2FA', function() {
-    this.timeout(10000); // Increase timeout to 10s
+    this.timeout(10000);
 
     it('Login should succeed with 2FA', async () => {
-      const loginStub = sandbox.stub(authHandler, 'login');
-      loginStub.onFirstCall().rejects({ error_code: 294 });
-      loginStub.onSecondCall().resolves({
-        email: credentials.email,
-        authtoken: 'test-token'
+        mockClient.login.resetBehavior();
+        mockClient.login.resetHistory();
+        
+        mockClient.login
+          .onFirstCall().resolves({ error_code: 294 })
+          .onSecondCall().resolves({ user: { email: credentials.email, authtoken: 'test-token' } });
+        
+        await authHandler.login(credentials.email, credentials.password);
+        expect(mockClient.login.callCount).to.equal(2);
       });
-      
-      await Helper.run(['auth:login', `--username=${credentials.email}`, `--password=${credentials.password}`]);
-      expect(loginStub.calledTwice).to.be.true;
-    });
 
-    it('Login should fail with invalid 2FA code', async () => {
-      const loginStub = sandbox.stub(authHandler, 'login');
-      loginStub.onFirstCall().rejects({ error_code: 294 });
-      loginStub.onSecondCall().rejects(new Error('Invalid 2FA code'));
-      
-      try {
-        await Helper.run(['auth:login', `--username=${credentials.email}`, `--password=${credentials.password}`]);
-      } catch (error) {
-        expect((error as Error).message).to.include('Invalid 2FA code');
-      }
-      
-      expect(loginStub.calledTwice).to.be.true;
-    });
+      it('Login should fail with invalid 2FA code', async () => {
+        mockClient.login.resetBehavior();
+        mockClient.login.resetHistory();
+        
+        mockClient.login
+          .onFirstCall().resolves({ error_code: 294 })
+          .onSecondCall().rejects(new Error('Invalid 2FA code'));
+        
+        try {
+          await authHandler.login(credentials.email, credentials.password);
+          throw new Error('Should have failed');
+        } catch (error) {
+          expect(error).to.be.instanceOf(CLIError);
+        }
+        
+        expect(mockClient.login.callCount).to.equal(2);
+      });
   });
 
   describe('Check auth:login command with OAuth', function() {

packages/contentstack-auth/test/unit/commands/login.test.ts

@@ -1,8 +1,14 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import LoginCommand from '../../../src/commands/auth/login';
-import { authHandler, interactive } from '../../../src/utils';
-import { configHandler, cliux } from '@contentstack/cli-utilities';
+import { authHandler, interactive, totpHandler } from '../../../src/utils';
+import { 
+  configHandler, 
+  cliux, 
+  messageHandler,
+  authHandler as oauthHandler
+} from '@contentstack/cli-utilities';
+import * as managementSDK from '@contentstack/cli-utilities';
 // @ts-ignore
 import * as conf from '../../config.json';
 
@@ -16,17 +22,39 @@ const TFATestToken = '24563992';
 describe('Login Command', () => {
   let loginStub: sinon.SinonStub;
 
-  before(function () {
-    loginStub = sinon.stub(authHandler, 'login').callsFake(function (email, password, tfaToken): Promise<any> {
+  let sandbox: sinon.SinonSandbox;
+
+  beforeEach(function () {
+    sandbox = sinon.createSandbox();
+    // Setup auth handler stub
+    loginStub = sandbox.stub(authHandler, 'login').callsFake(function (email, password, tfaToken): Promise<any> {
       if (password === credentials.password) {
         return Promise.resolve(user);
       }
       return Promise.reject({ message: 'invalid credentials' });
     });
+
+    // Setup management SDK client stub
+    const mockClient = {
+      login: sandbox.stub().resolves({ user: { email: credentials.email, authtoken: 'test-token' } }),
+      logout: sandbox.stub().resolves({}),
+      getUser: sandbox.stub().resolves({ email: credentials.email })
+    };
+    sandbox.stub(managementSDK, 'managementSDKClient').resolves(mockClient);
+    authHandler.client = mockClient;
+
+    // Setup TOTP handler stub
+    sandbox.stub(totpHandler, 'getTOTPCode').resolves(TFATestToken);
+
+    // Setup OAuth handler stub
+    sandbox.stub(oauthHandler, 'setConfigData').resolves();
+
+    // Setup message handler stub
+    sandbox.stub(messageHandler, 'parse').returns('Successfully logged in!!');
   });
 
-  after(() => {
-    loginStub.restore();
+  afterEach(() => {
+    sandbox.restore();
   });
 
   it('Login with valid credentials, should be successful', async function () {