Updated unit tests, fixed lint issues and test workflows

Author: netrajpatel

.github/workflows/unit-test.yml

@@ -22,27 +22,12 @@ jobs:
           node-version: '22.x'
           cache: 'pnpm' # optional but recommended
 
-      # - name: Temporarily disable contentstack package
-      #   run: mv packages/contentstack/package.json packages/contentstack/package.json.disabled || true
-
       - name: Install Dependencies (Excluding Contentstack)
         run: pnpm install --frozen-lockfile
 
       - name: Build all plugins (Excluding Contentstack)
         run: |
           NODE_ENV=PREPACK_MODE pnpm -r --sort run build
 
-      # - name: Restore contentstack package
-      #   run: mv packages/contentstack/package.json.disabled packages/contentstack/package.json || true
-
-      - name: Run tests for Contentstack Command
-        working-directory: ./packages/contentstack-command
-        run: npm run test:unit
-
-      - name: Run tests for Contentstack Config
-        working-directory: ./packages/contentstack-config
-        run: npm run test:unit
-
-      - name: Run tests for Contentstack Auth
-        working-directory: ./packages/contentstack-auth
-        run: NODE_ENV=PREPACK_MODE npm run test:unit
+      - name: Run tests
+        run: NODE_ENV=PREPACK_MODE pnpm test

.talismanrc

@@ -1,6 +1,14 @@
 fileignoreconfig:
+  - filename: packages/contentstack-utilities/src/fs-utility/core.ts
+    checksum: a3679bdc464c673ee5b53c2dd315cfda0e785bbb889a6fe33e61e8b34de17703
+  - filename: packages/contentstack-auth/src/utils/mfa-handler.ts
+    checksum: 723b1e69b2da51af73a7086e55a9ecedd4d1fd95855473eaa43a8375e0a92a7e
+  - filename: packages/contentstack-utilities/src/logger/logger.ts
+    checksum: ec84008d7715ccdfe32e32a4953b99bdb4c320f06ec411500858f87bf5b7db3c
+  - filename: packages/contentstack-auth/test/unit/commands/tokens-add.test.ts
+    checksum: d75044410ae06c75fb21ed06ac405854bd9a400fab15f74a0548c999bbdafaa3
+  - filename: packages/contentstack-config/test/unit/commands/remove-base-branch.test.ts
+    checksum: c7f98d87a9d686900781130f2c7684eaaf7d74869b79a2ab356140a2b6bf76b4
   - filename: pnpm-lock.yaml
-    checksum: 00d2cba7fffe932f86c5835d3dd23056a2055e6fa60d86175ca73710505b0d1d
-  - filename: packages/contentstack-auth/src/commands/auth/logout.ts
-    checksum: 20ff708d5a0ee56eb8786b19df07b49dacaddfa1deafe99c0397716c7865726d
+    checksum: 53f754f5f8dc328c10809124fb190b2a5d2cdb090075f24928394b781d1eaed7
 version: '1.0'

packages/contentstack-auth/.nycrc.json

@@ -1,5 +1,6 @@
 {
     "inlcude": [
         "lib/**/*.js"
-    ]
+    ],
+    "concurrency": 1
 }

packages/contentstack-auth/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.8.0-beta.0 darwin-arm64 node-v22.13.1
+@contentstack/cli-auth/1.8.0-beta.0 darwin-arm64 node-v24.13.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-auth/package.json

@@ -11,15 +11,12 @@
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
     "version": "oclif readme && git add README.md",
-    "test:report": "tsc -p test && nyc --reporter=lcov --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "pretest": "tsc -p test",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "posttest": "npm run lint",
     "lint": "eslint src/**/*.ts",
     "format": "eslint src/**/*.ts --fix",
-    "test:integration": "mocha --forbid-only \"test/integration/*.test.ts\"",
-    "test:unit": "mocha --forbid-only \"test/unit/**/*.test.ts\"",
-    "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
+    "pretest": "tsc -p test",
+    "test": "NODE_OPTIONS=--no-warnings nyc --concurrency=1 --extension .ts mocha --exit --forbid-only \"test/unit/**/*.test.ts\"",
+    "test:report": "NODE_OPTIONS=--no-warnings nyc --concurrency=1 --extension .ts mocha --exit --forbid-only \"test/unit/**/*.test.ts\"",
+    "posttest": "npm run lint"
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.8.0-beta.0",

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

@@ -1,4 +1,4 @@
-import { cliux, log, handleAndLogError, messageHandler } from '@contentstack/cli-utilities';
+import { cliux, log, messageHandler } from '@contentstack/cli-utilities';
 import { User } from '../interfaces';
 import { askOTPChannel, askOTP } from './interactive';
 

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

@@ -1,6 +1,5 @@
-import { cliux, configHandler, NodeCrypto, log, handleAndLogError, messageHandler } from '@contentstack/cli-utilities';
+import { cliux, configHandler, NodeCrypto, log } from '@contentstack/cli-utilities';
 import { authenticator } from 'otplib';
-import { askOTP } from './interactive';
 
 /**
  * @class
@@ -66,7 +65,7 @@ class MFAHandler {
    * @returns Promise<string> The MFA code
    * @throws Error if MFA code generation fails
    */
-  async getMFACode(): Promise<string> {
+  async getMFACode(): Promise<string | undefined> {
     log.debug('Getting MFA code', { module: 'mfa-handler' });
     let secret: string | undefined;
     let source: string;
@@ -87,6 +86,21 @@ class MFAHandler {
       }
     }
 
+    if (!secret) {
+      const stored = configHandler.get('mfa') as { secret?: string } | undefined;
+      if (stored?.secret) {
+        try {
+          const decrypted = this.encrypter.decrypt(stored.secret);
+          if (decrypted && this.isValidBase32(decrypted.toUpperCase())) {
+            secret = decrypted;
+            source = 'stored configuration';
+          }
+        } catch {
+          log.debug('Failed to decrypt stored MFA secret', { module: 'mfa-handler' });
+        }
+      }
+    }
+
     if (secret) {
       try {
         const code = this.generateMFACode(secret);
@@ -102,6 +116,16 @@ class MFAHandler {
         );
       }
     }
+    return undefined;
+  }
+
+  /**
+   * Validates if a string is a valid 6-digit MFA code format
+   * @param code The code to validate
+   * @returns true if valid format, false otherwise
+   */
+  isValidMFACode(code: string): boolean {
+    return /^\d{6}$/.test(code);
   }
 
 }