Merge branch 'development' into enh/dx-3902-Refactor-Endpoints-Integrations

Author: harshithad0703

package-lock.json

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

packages/contentstack-auth/package.json

@@ -182,36 +182,6 @@ class AuthHandler {
       }
     });
   }
-
-  /**
-   * Validate token
-   * @param {string} authtoken
-   * @returns {Promise} Promise object returns response object from Contentstack
-   */
-  async validateAuthtoken(authtoken: string): Promise<object> {
-    log.debug('Starting token validation.', { module: 'auth-handler', hasAuthToken: !!authtoken });
-
-    return new Promise((resolve, reject) => {
-      if (authtoken) {
-        log.debug('Making token validation API call.', { module: 'auth-handler' });
-
-        this._client
-          .getUser()
-          .then((user: object) => {
-            log.debug('Token validation successful.', { module: 'auth-handler', user });
-            resolve(user);
-          })
-          .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);
-          });
-      } else {
-        log.debug('Token validation failed: no auth token provided.', { module: 'auth-handler' });
-        reject(new Error(messageHandler.parse('CLI_AUTH_TOKEN_VALIDATION_NO_TOKEN')));
-      }
-    });
-  }
 }
 
 export default new AuthHandler();

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

@@ -1,4 +1,3 @@
 export { default as authHandler } from './auth-handler';
 export { default as mfaHandler } from './mfa-handler';
 export * as interactive from './interactive';
-export * as tokenValidation from './tokens-validation';

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

@@ -104,32 +104,6 @@ class MFAHandler {
     }
   }
 
-  /**
-   * Gets MFA code through manual user input
-   * @returns Promise<string> The MFA code
-   * @throws Error if code format is invalid
-   */
-  async getManualMFACode(): Promise<string> {
-    try {
-      const code = await askOTP();
-      if (!/^\d{6}$/.test(code)) {
-        throw new Error(messageHandler.parse('CLI_AUTH_MFA_INVALID_CODE'));
-      }
-      return code;
-    } catch (error) {
-      log.debug('Failed to get MFA code', { module: 'mfa-handler', error });
-      throw error;
-    }
-  }
-
-  /**
-   * Validates an MFA code format
-   * @param code The MFA code to validate
-   * @returns boolean True if valid, false otherwise
-   */
-  isValidMFACode(code: string): boolean {
-    return /^\d{6}$/.test(code);
-  }
 }
 
 export default new MFAHandler();

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

@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { configHandler, cliux } from '@contentstack/cli-utilities';
 import TokensAddCommand from '../../../src/commands/auth/tokens/add';
-import { tokenValidation } from '../../../src/utils';
 import { stub, assert } from 'sinon';
 import { config as dotenvConfig } from 'dotenv';
 import nock from 'nock';
@@ -31,8 +30,6 @@ function resetConfig() {
   config.delete(`${configKeyTokens}.newToken`);
 }
 describe('Tokens Add Command', () => {
-  let apiKeyValidationStub: sinon.SinonStub;
-  let environmentTokenValidationStub: sinon.SinonStub;
   let printStub: sinon.SinonStub;
   const validAPIKey = conf.validAPIKey;
   const validDeliveryToken = '***REMOVED***';
@@ -43,28 +40,9 @@ describe('Tokens Add Command', () => {
     resetConfig();
     if ((cliux.print as any).restore) (cliux.print as any).restore();
     printStub = stub(cliux, 'print');
-    apiKeyValidationStub = sinon
-      .stub(tokenValidation, 'validateAPIKey')
-      .callsFake(function (client: any, apiKey: string): Promise<any> {
-        if (apiKey === validAPIKey) {
-          return Promise.resolve({ valid: true, message: 'success' });
-        }
-        return Promise.resolve({ valid: false, message: 'failed' });
-      });
-
-    environmentTokenValidationStub = sinon
-      .stub(tokenValidation, 'validateEnvironment')
-      .callsFake(function (client: any, apiKey: string, environment): Promise<any> {
-        if (environment === validEnvironment) {
-          return Promise.resolve({ valid: true, message: 'success' });
-        }
-        return Promise.resolve({ valid: false, message: 'failed' });
-      });
   });
 
   after(() => {
-    apiKeyValidationStub.restore();
-    environmentTokenValidationStub.restore();
     printStub.restore();
     resetConfig();
   });

packages/contentstack-auth/src/utils/tokens-validation.ts

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

packages/contentstack-auth/test/unit/commands/tokens-add.test.ts

@@ -25,7 +25,7 @@
     "@contentstack/cli-audit": "~1.17.1",
     "@contentstack/cli-cm-export": "~1.23.1",
     "@contentstack/cli-cm-import": "~1.31.2",
-    "@contentstack/cli-auth": "~1.7.2",
+    "@contentstack/cli-auth": "~1.7.3",
     "@contentstack/cli-cm-bootstrap": "~1.18.2",
     "@contentstack/cli-cm-branches": "~1.6.3",
     "@contentstack/cli-cm-bulk-publish": "~1.10.6",