merge main to v2-dev

Author: harshitha-cstk

.cursor/skills/framework/references/framework-patterns.md

@@ -347,6 +347,7 @@ if (!configHandler.get('authenticationMethod')) {
 }
 ```
 
+<<<<<<< HEAD
 ### OAuth Token Refresh Serialization
 
 When multiple API calls happen concurrently and a token refresh is needed, serialize the refresh operation so all concurrent callers await the same refresh instead of duplicate refresh attempts.
@@ -413,6 +414,8 @@ async compareOAuthExpiry(force: boolean = false): Promise<void> {
 - Any critical operation that should only run once even with concurrent triggers
 - Operations where parallel execution would cause conflicts or race conditions
 
+=======
+>>>>>>> main
 ## Common Patterns
 
 ### Error and Success Pattern

.github/workflows/unit-test.yml

@@ -30,7 +30,13 @@ jobs:
       - name: Test contentstack-auth
         working-directory: ./packages/contentstack-auth
         run: pnpm test
+<<<<<<< HEAD
       # Commented out in v2-beta production
       # - name: Test contentstack-utilities
       #   working-directory: ./packages/contentstack-utilities
-      #   run: pnpm test
+      #   run: pnpm test
+=======
+      - name: Test contentstack-utilities
+        working-directory: ./packages/contentstack-utilities
+        run: pnpm test
+>>>>>>> main

packages/contentstack-auth/.mocharc.json

@@ -1,9 +1,14 @@
 {
   "require": [
     "test/helpers/init.js",
+<<<<<<< HEAD
     "ts-node/register",
     "source-map-support/register",
     "test/helpers/mocha-root-hooks.js"
+=======
+    "ts-node/register/transpile-only",
+    "source-map-support/register"
+>>>>>>> main
   ],
   "watch-extensions": ["ts"],
   "recursive": true,

packages/contentstack-auth/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
+<<<<<<< HEAD
   "version": "2.0.0-beta.10",
+=======
+  "version": "1.8.0",
+>>>>>>> main
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -15,8 +19,13 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@contentstack/cli-command": "~2.0.0-beta.5",
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
+=======
+    "@contentstack/cli-command": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.18.0",
+>>>>>>> main
     "@oclif/core": "^4.8.3",
     "@oclif/plugin-help": "^6.2.28",
     "otplib": "^12.0.1"

packages/contentstack-auth/test/unit/auth-handler.test.ts

@@ -3,10 +3,15 @@ import * as sinon from 'sinon';
 import { authHandler, interactive } from '../../src/utils';
 import { CLIError, cliux } from '@contentstack/cli-utilities';
 import { User } from '../../src/interfaces';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const config = JSON.parse(readFileSync(join(__dirname, './config.json'), 'utf-8'));
+=======
+// @ts-ignore
+import * as config from './config.json';
+>>>>>>> main
 
 const user: User = { email: '***REMOVED***', authtoken: 'testtoken' };
 const credentials = { email: '***REMOVED***', password: config.password };

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

@@ -9,10 +9,15 @@ import {
   authHandler as oauthHandler
 } from '@contentstack/cli-utilities';
 import * as managementSDK from '@contentstack/cli-utilities';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const conf = JSON.parse(readFileSync(join(__dirname, '../config.json'), "utf-8"));
+=======
+// @ts-ignore
+import * as conf from '../config.json';
+>>>>>>> main
 
 const config = configHandler;
 

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

@@ -9,10 +9,15 @@ import {
   authHandler as oauthHandler
 } from '@contentstack/cli-utilities';
 import * as managementSDK from '@contentstack/cli-utilities';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const conf = JSON.parse(readFileSync(join(__dirname, '../config.json'), "utf-8"));
+=======
+// @ts-ignore
+import * as conf from '../config.json';
+>>>>>>> main
 
 const config = configHandler;
 

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

@@ -5,10 +5,15 @@ import TokensAddCommand from '../../../src/commands/auth/tokens/add';
 import { stub, assert } from 'sinon';
 import { config as dotenvConfig } from 'dotenv';
 import nock from 'nock';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const conf = JSON.parse(readFileSync(join(__dirname, '../config.json'), "utf-8"));
+=======
+// @ts-ignore
+import * as conf from '../config.json';
+>>>>>>> main
 
 dotenvConfig();
 

packages/contentstack-auth/test/unit/interactive.test.ts

@@ -2,10 +2,15 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { interactive } from '../../src/utils';
 import { cliux } from '@contentstack/cli-utilities';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const config = JSON.parse(readFileSync(join(__dirname, './config.json'), "utf-8"));
+=======
+//@ts-ignore
+import * as config from './config.json'
+>>>>>>> main
 
 describe('Interactive', () => {
   let inquireStub: sinon.SinonStub;

packages/contentstack-auth/test/unit/mfa-handler.test.ts

@@ -46,6 +46,10 @@ describe('MFAHandler', () => {
     });
 
     it.skip('should fallback to stored configuration when environment variable is not set', async () => {
+<<<<<<< HEAD
+=======
+      // Stubbing NodeCrypto.prototype does not affect already-created mfaHandler instance
+>>>>>>> main
       const encryptedSecret = 'encrypted-secret';
       configStub.returns({ secret: encryptedSecret });
       encrypterStub.decrypt.returns(validSecret);
@@ -65,4 +69,8 @@ describe('MFAHandler', () => {
       expect(authenticator.verify({ token: code, secret: envSecret })).to.be.true;
     });
   });
+<<<<<<< HEAD
+=======
+
+>>>>>>> main
 });