@contentstack/cli-utilities 2.0.0 → 2.0.1

package/lib/auth-handler.js

@@ -91,7 +91,9 @@ class AuthHandler {
     async initSDK() {
         // Ensure we have a valid host for the SDK initialization
         const host = this._host || this.getCmaHost();
-        this.managementAPIClient = await (0, contentstack_management_sdk_1.default)({ host });
+        // skipTokenValidity: true avoids calling compareOAuthExpiry here, which would deadlock
+        // when initSDK is itself called from inside a compareOAuthExpiry refresh cycle.
+        this.managementAPIClient = await (0, contentstack_management_sdk_1.default)({ host, skipTokenValidity: true });
         this.oauthHandler = this.managementAPIClient.oauth({
             appId: this.OAuthAppId,
             clientId: this.OAuthClientId,
@@ -347,7 +349,17 @@ class AuthHandler {
                 return this.oauthRefreshInFlight;
             }
             this.isRefreshingToken = true;
-            this.oauthRefreshInFlight = (async () => {
+            // Set the guard promise BEFORE starting the async work so re-entrant synchronous
+            // callers (e.g. compareOAuthExpiry invoked again via refreshToken → initSDK →
+            // managementSDKClient → createAPIClient) see a non-null oauthRefreshInFlight and
+            // return early instead of starting another recursive refresh cycle.
+            let _resolve;
+            let _reject;
+            this.oauthRefreshInFlight = new Promise((res, rej) => {
+                _resolve = res;
+                _reject = rej;
+            });
+            (async () => {
                 try {
                     if (force) {
                         cli_ux_1.default.print('Forcing token refresh...');
@@ -356,10 +368,11 @@ class AuthHandler {
                         cli_ux_1.default.print('Token expired, refreshing the token');
                     }
                     await this.refreshToken();
+                    _resolve();
                 }
                 catch (error) {
                     cli_ux_1.default.error('Error refreshing token');
-                    throw error;
+                    _reject(error);
                 }
                 finally {
                     this.isRefreshingToken = false;

package/lib/authentication-handler.js

@@ -53,6 +53,11 @@ class AuthenticationHandler {
         if (error.response && error.response.status) {
             switch (error.response.status) {
                 case 401:
+                    if (maxRetryCount >= 2) {
+                        const errorDetails = (0, index_1.formatError)(error);
+                        index_1.cliux.print(`Authentication failed after token refresh: ${errorDetails}`, { color: 'red' });
+                        return;
+                    }
                     // NOTE: Refresh the token if the type is OAuth.
                     const region = index_1.configHandler.get('region') || {};
                     if (region === null || region === void 0 ? void 0 : region.cma) {
@@ -65,11 +70,10 @@ class AuthenticationHandler {
                         hostName = hostName || region.cma;
                         const refreshed = await this.refreshToken(hostName);
                         if (refreshed) {
-                            return this.refreshAccessToken(error, maxRetryCount); // Retry after refreshing the token
+                            return this.refreshAccessToken(error, maxRetryCount + 1);
                         }
                         const errorDetails = (0, index_1.formatError)(error);
                         index_1.cliux.print(`Authentication failed: ${errorDetails}`, { color: 'red' });
-                        // For Basic Auth, exit immediately without retrying
                         return;
                     }
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,11 +28,11 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.30.3",
-    "@contentstack/marketplace-sdk": "^1.5.2",
+    "@contentstack/management": "~1.31.1",
+    "@contentstack/marketplace-sdk": "^1.5.4",
     "@contentstack/utils": "~1.9.1",
     "@oclif/core": "^4.11.14",
-    "axios": "^1.18.1",
+    "axios": "^1.20.0",
     "chalk": "^5.6.2",
     "cli-cursor": "^3.1.0",
     "cli-progress": "^3.12.0",
@@ -43,7 +43,7 @@
     "inquirer": "12.11.1",
     "inquirer-search-checkbox": "^1.0.0",
     "inquirer-search-list": "^1.2.6",
-    "js-yaml": "^4.3.0",
+    "js-yaml": "^4.3.2",
     "klona": "^2.0.6",
     "lodash": "^4.18.1",
     "mkdirp": "^1.0.4",
@@ -62,7 +62,7 @@
   },
   "overrides": {
     "@oclif/core": {
-      "picomatch": "^4.0.4"
+      "picomatch": "^4.0.7"
     }
   },
   "devDependencies": {