Fixed merge conflits

sunil-lakshman · sunil-lakshman · commit 133d695fbc29 · 2025-05-30T17:47:53.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -20,8 +20,8 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
     "@oclif/plugin-help": "^6.2.28",
-    "@contentstack/cli-utilities": "~1.11.1",
-    "@oclif/plugin-plugins": "^5.4.38",
+    "@contentstack/cli-utilities": "~1.11.2",
+    "@oclif/plugin-plugins": "^5.4.36",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@contentstack/cli-cm-seed": "~1.11.1",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "inquirer": "8.2.6",
     "mkdirp": "^1.0.4",
     "tar": "^6.2.1 "
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
     "@oclif/core": "^4.3.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "chalk": "^4.1.2",
     "just-diff": "^6.0.2",
     "lodash": "^4.17.21"
diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "chalk": "^4.1.2",
     "dotenv": "^16.5.0",
     "inquirer": "8.2.6",
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -9,7 +9,7 @@
     "@contentstack/cli-cm-export": "~1.16.2",
     "@contentstack/cli-cm-import": "~1.22.1",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "chalk": "^4.1.2",
     "inquirer": "8.2.6",
     "lodash": "^4.17.21",
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
@@ -17,7 +17,7 @@
     "format": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "contentstack": "^3.25.3"
   },
   "devDependencies": {
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.6",
     "inquirer-checkbox-plus-prompt": "1.4.2",
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -8,7 +8,7 @@
     "@contentstack/cli-command": "~1.5.0",
     "@contentstack/cli-variants": "~1.2.1",
     "@oclif/core": "^4.3.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
     "@oclif/core": "^4.3.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "big-json": "^3.2.0",
     "chalk": "^4.1.2",
     "fs-extra": "^11.3.0",
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-audit": "~1.12.2",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "@contentstack/management": "~1.21.3",
     "@contentstack/cli-variants": "~1.2.1",
     "@oclif/core": "^4.3.0",
diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "@contentstack/json-rte-serializer": "~2.1.0",
     "collapse-whitespace": "^1.1.7",
     "chalk": "^4.1.2",
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
@@ -5,7 +5,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "async": "^3.2.6",
     "callsites": "^3.1.0",
     "cardinal": "^2.1.1",
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-cm-import": "~1.22.1",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "@contentstack/management": "~1.21.3",
     "inquirer": "8.2.6",
     "mkdirp": "^1.0.4",
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/contentstack-utilities/src/authentication-handler.ts b/packages/contentstack-utilities/src/authentication-handler.ts
@@ -53,16 +53,6 @@ class AuthenticationHandler {
 
   async refreshAccessToken(error: any, maxRetryCount = 1): Promise<void> {
     if (error.response && error.response.status) {
-      console.error(error.response);
-      if (maxRetryCount >= 3) {
-        ux.print('Max retry count reached, please login to proceed', {
-          color: 'yellow',
-        });
-        process.exit(1);
-      }
-
-      maxRetryCount++; // Increment for the next retry attempt
-
       switch (error.response.status) {
         case 401:
           // NOTE: Refresh the token if the type is OAuth.
@@ -74,12 +64,25 @@ class AuthenticationHandler {
               if (u.host) hostName = u.host;
             }
             hostName = hostName || region.cma;
-            await this.refreshToken(hostName);
-            return this.refreshAccessToken(error, maxRetryCount); // Retry after refreshing the token
+            const refreshed = await this.refreshToken(hostName);
+            if (refreshed) {
+              return this.refreshAccessToken(error, maxRetryCount); // Retry after refreshing the token
+            }
+            console.log('API(401) case error:-', error.response);
+            // For Basic Auth, exit immediately without retrying
+            return;
           }
+          break;
 
         case 429:
         case 408:
+          if (maxRetryCount >= 3) {
+            ux.print('Max retry count reached, please login to proceed', {
+              color: 'yellow',
+            });
+            process.exit(1);
+          }
+          maxRetryCount++; // Increment for the next retry attempt
           // These cases require a wait, adding a delay before retrying
           await new Promise((resolve) => setTimeout(resolve, 1000)); // wait for 1 second
           return this.refreshAccessToken(error, maxRetryCount); // Retry
@@ -93,8 +96,6 @@ class AuthenticationHandler {
   refreshToken(hostName: string): Promise<boolean> {
     return new Promise<boolean>((resolve) => {
       if (this.authType === 'BASIC') {
-        // NOTE Handle basic auth 401 here
-        resolve(false);
         ux.print('Session timed out, please login to proceed', {
           color: 'yellow',
         });
@@ -109,10 +110,10 @@ class AuthenticationHandler {
             resolve(true);
           })
           .catch((error: any) => {
+            console.log(error);
             resolve(false);
           });
       } else {
-        resolve(false);
         ux.print('You do not have the permissions to perform this action, please login to proceed', {
           color: 'yellow',
         });
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -38,7 +38,7 @@
     "@contentstack/cli-config": "~1.12.1",
     "@contentstack/cli-launch": "^1.9.1",
     "@contentstack/cli-migration": "~1.7.2",
-    "@contentstack/cli-utilities": "~1.11.1",
+    "@contentstack/cli-utilities": "~1.11.2",
     "@contentstack/cli-variants": "~1.2.1",
     "@contentstack/management": "~1.21.3",
     "@oclif/core": "^4.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
