@contentstack/cli-utilities 2.0.0-beta.4 → 2.0.0-beta.6

package/lib/auth-handler.d.ts

@@ -23,7 +23,10 @@ declare class AuthHandler {
     private allAuthConfigItems;
     private oauthHandler;
     private managementAPIClient;
+    /** True while an OAuth access-token refresh is running (for logging/diagnostics; correctness uses `oauthRefreshInFlight`). */
     private isRefreshingToken;
+    /** Serialize OAuth refresh so concurrent API calls await the same refresh instead of proceeding with a stale token. */
+    private oauthRefreshInFlight;
     private cmaHost;
     set host(contentStackHost: any);
     constructor();
@@ -45,8 +48,8 @@ declare class AuthHandler {
     getAuthorisationType(): Promise<any>;
     isAuthorisationTypeBasic(): Promise<boolean>;
     isAuthorisationTypeOAuth(): Promise<boolean>;
-    checkExpiryAndRefresh: (force?: boolean) => Promise<void | object>;
-    compareOAuthExpiry(force?: boolean): Promise<void | object>;
+    checkExpiryAndRefresh: (force?: boolean) => Promise<void>;
+    compareOAuthExpiry(force?: boolean): Promise<void>;
     restoreOAuthConfig(): void;
 }
 declare const _default: AuthHandler;

package/lib/auth-handler.js

@@ -22,7 +22,10 @@ class AuthHandler {
         this.cmaHost = this.getCmaHost();
     }
     constructor() {
+        /** True while an OAuth access-token refresh is running (for logging/diagnostics; correctness uses `oauthRefreshInFlight`). */
         this.isRefreshingToken = false; // Flag to track if a refresh operation is in progress
+        /** Serialize OAuth refresh so concurrent API calls await the same refresh instead of proceeding with a stale token. */
+        this.oauthRefreshInFlight = null;
         this.checkExpiryAndRefresh = (force = false) => this.compareOAuthExpiry(force);
         this.OAuthAppId = process.env.OAUTH_APP_ID || '6400aa06db64de001a31c8a9';
         this.OAuthClientId = process.env.OAUTH_CLIENT_ID || 'Ie0FEfTzlfAHL4xM';
@@ -329,44 +332,41 @@ class AuthHandler {
         return config_handler_1.default.get(this.authorisationTypeKeyName) === this.authorisationTypeOAUTHValue ? true : false;
     }
     async compareOAuthExpiry(force = false) {
-        // Avoid recursive refresh operations
-        if (this.isRefreshingToken) {
-            cli_ux_1.default.print('Refresh operation already in progress');
-            return Promise.resolve();
-        }
         const oauthDateTime = config_handler_1.default.get(this.oauthDateTimeKeyName);
         const authorisationType = config_handler_1.default.get(this.authorisationTypeKeyName);
         if (oauthDateTime && authorisationType === this.authorisationTypeOAUTHValue) {
             const now = new Date();
             const oauthDate = new Date(oauthDateTime);
-            const oauthValidUpto = new Date();
-            oauthValidUpto.setTime(oauthDate.getTime() + 59 * 60 * 1000);
-            if (force) {
-                cli_ux_1.default.print('Forcing token refresh...');
-                return this.refreshToken();
+            const oauthValidUpto = new Date(oauthDate.getTime() + 59 * 60 * 1000);
+            const tokenExpired = oauthValidUpto <= now;
+            const shouldRefresh = force || tokenExpired;
+            if (!shouldRefresh) {
+                return Promise.resolve();
             }
-            else {
-                if (oauthValidUpto > now) {
-                    return Promise.resolve();
-                }
-                else {
-                    cli_ux_1.default.print('Token expired, refreshing the token');
-                    // Set the flag before refreshing the token
-                    this.isRefreshingToken = true;
-                    try {
-                        await this.refreshToken();
-                    }
-                    catch (error) {
-                        cli_ux_1.default.error('Error refreshing token');
-                        throw error;
+            if (this.oauthRefreshInFlight) {
+                return this.oauthRefreshInFlight;
+            }
+            this.isRefreshingToken = true;
+            this.oauthRefreshInFlight = (async () => {
+                try {
+                    if (force) {
+                        cli_ux_1.default.print('Forcing token refresh...');
                     }
-                    finally {
-                        // Reset the flag after refresh operation is completed
-                        this.isRefreshingToken = false;
+                    else {
+                        cli_ux_1.default.print('Token expired, refreshing the token');
                     }
-                    return Promise.resolve();
+                    await this.refreshToken();
                 }
-            }
+                catch (error) {
+                    cli_ux_1.default.error('Error refreshing token');
+                    throw error;
+                }
+                finally {
+                    this.isRefreshingToken = false;
+                    this.oauthRefreshInFlight = null;
+                }
+            })();
+            return this.oauthRefreshInFlight;
         }
         else {
             cli_ux_1.default.print('No OAuth configuration set.');

package/lib/progress-summary/cli-progress-manager.js

@@ -58,13 +58,9 @@ class CLIProgressManager {
      * so output is pure timestamped log lines (per documentation).
      */
     static printGlobalSummary() {
-        var _a;
         if (!CLIProgressManager.globalSummary) {
             return;
         }
-        if ((_a = __1.configHandler.get('log')) === null || _a === void 0 ? void 0 : _a.showConsoleLogs) {
-            return;
-        }
         // Apply strategy-based corrections before printing
         CLIProgressManager.applyStrategyCorrections();
         // Print the final summary
@@ -468,7 +464,11 @@ class CLIProgressManager {
                             ? (0, chalk_1.getChalk)().green(`✓ Complete (${this.successCount}/${totalProcessed})`)
                             : (0, chalk_1.getChalk)().yellow(`✓ Complete (${this.successCount}/${totalProcessed})`)
                         : (0, chalk_1.getChalk)().cyan(`${this.successCount}✓ ${this.failureCount}✗`);
-                    const labelColor = totalProcessed >= this.total ? (this.failureCount === 0 ? (0, chalk_1.getChalk)().green : (0, chalk_1.getChalk)().yellow) : (0, chalk_1.getChalk)().cyan;
+                    const labelColor = totalProcessed >= this.total
+                        ? this.failureCount === 0
+                            ? (0, chalk_1.getChalk)().green
+                            : (0, chalk_1.getChalk)().yellow
+                        : (0, chalk_1.getChalk)().cyan;
                     const formattedName = this.formatModuleName(this.moduleName);
                     const displayName = formattedName.length > 20 ? formattedName.substring(0, 17) + '...' : formattedName;
                     this.progressBar.increment(1, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -33,7 +33,7 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.27.6",
+    "@contentstack/management": "~1.29.1",
     "@contentstack/marketplace-sdk": "^1.5.0",
     "@oclif/core": "^4.3.0",
     "axios": "^1.13.5",
@@ -49,7 +49,7 @@
     "inquirer-search-list": "^1.2.6",
     "js-yaml": "^4.1.1",
     "klona": "^2.0.6",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "mkdirp": "^1.0.4",
     "open": "^8.4.2",
     "ora": "^5.4.1",
@@ -82,4 +82,4 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.0.0"
   }
-}
+}