Merge pull request #2365 from contentstack/fix/merge-development-beta

Fix/merge development beta

Author: harshithad0703

.github/workflows/release.yml

@@ -192,6 +192,10 @@ jobs:
         if: ${{env.release_releaseAll == 'true' || env.release_plugins_clone == 'true'}}
         working-directory: ./packages/contentstack-clone
         run: npm install
+      - name: Compiling Clone
+        if: ${{ steps.clone-installation.conclusion == 'success'  }}
+        working-directory: ./packages/contentstack-clone
+        run: npm run prepack
       - name: Publishing clone
         uses: JS-DevTools/npm-publish@v3
         if: ${{ steps.clone-installation.conclusion == 'success'  }}

.talismanrc

@@ -1,28 +1,6 @@
 fileignoreconfig:
-  - filename: pnpm-lock.yaml
-    checksum: f20d4336b379ba896f0092ed8dd03df2c6e5bc34fe200e58002efc2c77fd9359
-  - filename: package-lock.json
-    checksum: b41714137255ba498375116ae9410e04af150d75ba323c8dbaeb8995564a4677
-  - filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/environments/environments.json
-    checksum: 0402604e5919a7e38ecb5ff0916d6ae5ab7d98fe78ff6ac9eba8a9b8130af34d
-  - filename: packages/contentstack-utilities/src/helpers.ts
-    checksum: 6a741bb972f59c56d2c0f3a9f96e2963392361db2e401948c9c1796829478e13
-  - filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/composable_studio.json
-    checksum: 6912e5ea32b4456ad04d1645750c72bbb29ab1895368c3a242ab39e9350ec531
-  - filename: packages/contentstack-utilities/src/logger/session-path.ts
-    checksum: 4c66980a857bc12012a45e50790c0eaab06883db5e1476d84fb142a08b70b2e7
-  - filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
-    checksum: a9e24596e7ae54b71cc28a41cf9d65bbdbf6754446e08958288e90a579cc351d
-  - filename: packages/contentstack-audit/src/modules/modulesData.ts
-    checksum: 1e6c1fba1172512401038d5454c8d218201ec62262449c5c878609592e0124c4
-  - filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/invalid_composable_studio.json
-    checksum: e6465aa0011d1565a2de848d9cca74395d11419e6ac840e7dfb52e1d255b1c4f
-  - filename: packages/contentstack-audit/src/modules/composable-studio.ts
-    checksum: 4fc97ff582d6dff9a54b3a50dfa3cbb5febd38a55aeb8737034b97188ad543ba
-  - filename: packages/contentstack-utilities/test/unit/logger.test.ts
-    checksum: a1939dea16166b1893a248179524a76f2ed20b04b99c83bd1a5a13fcf6f0dadc
-  - filename: packages/contentstack-clone/README.md
-    checksum: 8580ab3f52a079a6411c27cbaad66e3a70d9ac5ea59fc429a8f17c95d09399f8
-  - filename: packages/contentstack/README.md
-    checksum: 72850c976661f2912b5bca39734de09d56c311c2266fc67696c45ed3fb0b7511
-version: "1.0"
+- filename: pnpm-lock.yaml
+  checksum: 2ab7172b5b105a5e903aa7d4fc4b38d282e2c32befdc8b219c3bb3fb40aead2a
+- filename: package-lock.json
+  checksum: 62030a34e011bd34bc4a071d868210cfe9c90ae5241250a576f7cb212084dbf1
+version: '1.0'

package-lock.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

@@ -1,6 +1,5 @@
-import { cliux, NodeCrypto, log, messageHandler } from '@contentstack/cli-utilities';
+import { cliux, NodeCrypto, log } from '@contentstack/cli-utilities';
 import { authenticator } from 'otplib';
-import { askOTP } from './interactive';
 
 /**
  * @class
@@ -104,32 +103,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';
@@ -70,8 +69,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***';
@@ -82,28 +79,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

@@ -64,16 +64,4 @@ describe('MFAHandler', () => {
       expect(authenticator.verify({ token: code, secret: envSecret })).to.be.true;
     });
   });
-
-  describe('isValidMFACode', () => {
-    it('should validate correct format MFA codes', () => {
-      expect(mfaHandler.isValidMFACode('123456')).to.be.true;
-    });
-
-    it('should reject incorrect format MFA codes', () => {
-      expect(mfaHandler.isValidMFACode('12345')).to.be.false; // Too short
-      expect(mfaHandler.isValidMFACode('1234567')).to.be.false; // Too long
-      expect(mfaHandler.isValidMFACode('abcdef')).to.be.false; // Non-numeric
-    });
-  });
 });