Fixed PR comments

Author: cs-raj

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 224e964141bc7c7a3481c28ce6a5a2e731f9c3eebb845bfafa00cafa2242168b
+  checksum: 8ba4b5d673c619563531c67e9107f401b4cf182a5121872fee5f5718c0f6a7de
 - filename: pnpm-lock.yaml
-  checksum: e0310a5c5772a87bf606ee80722e29f9d0bc412ce10444f825a5c14dce4c1b88
+  checksum: 0efdfd8a272f5a31d2ebf0167d01c3f2dd779799e2ab25a741f83f29318951e9
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -60,15 +60,15 @@ fileignoreconfig:
 - filename: packages/contentstack-config/src/interfaces/index.ts
   checksum: e526a2bf5d58a70a2cf3b5415414c1912435364fa2bb70fcc5d2aed2465fe944
 - filename: packages/contentstack-config/src/utils/mfa-handler.ts
-  checksum: f90c2177146e8719ce194f927fd952b9c9599d893ae557c8d20fe5fd71f87b79
+  checksum: 72a0e6c9f2b644dad8abcc2a3f24da1ee415bb60f4bc036231edfca0f1aad8e5
 - filename: packages/contentstack-config/src/utils/interactive.ts
-  checksum: 59c6a2565657257acd3d771d1a57bfccf39e57f4e79252de9dbb7d92663a9ffb
+  checksum: 4289f1bce0544c67635fec5986ff19d6dd6d61e92ecb509159c67567d214a2ba
 - filename: packages/contentstack-config/src/base-command.ts
   checksum: 2ed06c24c5c34ac334437f98a62c6d72198e498cd1962a3cb027e08ca13667b4
 - filename: packages/contentstack-config/test/unit/commands/mfa.test.ts
   checksum: db582587d396657caff462a862973dfa47efd1ce60dc1ee99823c89d8e45a293
 - filename: packages/contentstack-config/src/commands/config/mfa/add.ts
-  checksum: 2de27bbd9a1868354da2a4b91ee095d4a262bdfdbfb11e55ce83ad9e07bf7545
+  checksum: e1719e64eb53d2d072742220e41765f7c5f70b07cbba26738f23e25ed85467f8
 - filename: packages/contentstack-config/test/unit/utils/mfa.service.test.ts
   checksum: 37ecf2e40ef008bea5d418637d7cabad59896430ee8d985d098ec2193d809299
 version: "1.0"

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
-    "@contentstack/cli-cm-export": "~1.19.0",
+    "@contentstack/cli-cm-export": "~1.20.0",
     "@contentstack/cli-cm-import": "~1.26.1",
     "@contentstack/cli-command": "~1.6.0",
     "@contentstack/cli-utilities": "~1.13.1",

packages/contentstack-clone/package.json

@@ -1,7 +1,7 @@
 import { cliux, handleAndLogError, log, messageHandler } from '@contentstack/cli-utilities';
 import { BaseCommand } from '../../../base-command';
 import { MFAService } from '../../../utils/mfa-handler';
-import { promptForMFASecret, confirmMFAOverwrite } from '../../../utils/interactive';
+import { getMFASecretInput, confirmOverwriteMFASecret } from '../../../utils/interactive';
 
 export default class AddMFACommand extends BaseCommand<typeof AddMFACommand> {
   static readonly description = 'Add MFA Secret for Two-Factor Authentication';
@@ -51,7 +51,7 @@ export default class AddMFACommand extends BaseCommand<typeof AddMFACommand> {
         });
       }
 
-      const secret = envSecret || (await promptForMFASecret());
+      const secret = envSecret || (await getMFASecretInput());
 
       if (!secret || !this.mfaService.validateSecret(secret)) {
         log.debug('MFA secret input is empty or the secret validation fails exiting!', {
@@ -76,7 +76,7 @@ export default class AddMFACommand extends BaseCommand<typeof AddMFACommand> {
           ...this.contextDetails,
           hasExistingConfig: true,
         });
-        const confirm = await confirmMFAOverwrite();
+        const confirm = await confirmOverwriteMFASecret();
         if (!confirm) {
           log.debug('User cancelled the override operation', {
             ...this.contextDetails,

packages/contentstack-config/src/commands/config/mfa/add.ts

@@ -129,7 +129,7 @@ export async function askLogPath(): Promise<string> {
   return logPath;
 }
 
-export async function promptForMFASecret(): Promise<string> {
+export async function getMFASecretInput(): Promise<string> {
   const secret = await cliux.inquire<string>({
     type: 'password',
     name: 'secret',
@@ -146,7 +146,7 @@ export async function promptForMFASecret(): Promise<string> {
   return secret;
 }
 
-export async function confirmMFAOverwrite(): Promise<boolean> {
+export async function confirmOverwriteMFASecret(): Promise<boolean> {
   return cliux.inquire<boolean>({
     type: 'confirm',
     name: 'confirm',

packages/contentstack-config/src/utils/interactive.ts

@@ -27,13 +27,16 @@ export class MFAService implements IMFAService {
     // Check padding
     const paddingRegex = /=*$/;
     const paddingMatch = paddingRegex.exec(normalizedSecret);
-    let paddingLength = 0;
+    const paddingLength = paddingMatch?.[0].length || 0;
     if (paddingMatch) {
-      paddingLength = paddingMatch[0].length;
-      log.debug('Checking padding validity');
-      if (paddingLength === 1 || paddingLength === 3 || paddingLength > 7) {
-        log.debug('Secret validation failed: invalid padding length');
-        return false;
+      if (paddingLength) {
+        log.debug('Checking padding validity');
+        const isInvalidPadding = [1, 3].includes(paddingLength) || paddingLength > 7;
+
+        if (isInvalidPadding) {
+          log.debug('Secret validation failed: invalid padding length');
+          return false;
+        }
       }
     }
 

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

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-export/package.json

@@ -27,8 +27,8 @@
     "@contentstack/cli-cm-bootstrap": "~1.15.0",
     "@contentstack/cli-cm-branches": "~1.5.0",
     "@contentstack/cli-cm-bulk-publish": "~1.9.0",
-    "@contentstack/cli-cm-clone": "~1.15.1",
-    "@contentstack/cli-cm-export": "~1.19.0",
+    "@contentstack/cli-cm-clone": "~1.15.2",
+    "@contentstack/cli-cm-export": "~1.20.0",
     "@contentstack/cli-cm-export-to-csv": "~1.9.0",
     "@contentstack/cli-cm-import": "~1.26.2",
     "@contentstack/cli-cm-import-setup": "1.4.1",