Merge pull request #2124 from contentstack/fix/DX-3539

fix: refresh token issue with custom region(dev, stage)

Author: harshithad0703

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/contentstack-utilities/package.json

@@ -37,9 +37,12 @@ class AuthHandler {
   private oauthHandler: any;
   private managementAPIClient: ContentstackClient;
   private isRefreshingToken: boolean = false; // Flag to track if a refresh operation is in progress
+  private cmaHost: string;
 
   set host(contentStackHost) {
     this._host = contentStackHost;
+    // Update cmaHost when host is set
+    this.cmaHost = this.getCmaHost();
   }
 
   constructor() {
@@ -76,6 +79,24 @@ class AuthHandler {
         this.authorisationTypeKeyName,
       ],
     };
+    this.cmaHost = this.getCmaHost();
+  }
+
+  private getCmaHost(): string {
+    if (this._host) {
+      return this._host;
+    }
+    
+    const cma = configHandler.get('region')?.cma;
+    if (cma && cma.startsWith('http')) {
+      try {
+        const u = new URL(cma);
+        if (u.host) return u.host;
+      } catch (error) {
+        // If URL parsing fails, return the original cma value
+      }
+    }
+    return cma;
   }
   initLog() {
     this.logger = new LoggerService(process.cwd(), 'cli-log');
@@ -91,7 +112,9 @@ class AuthHandler {
   }
 
   async initSDK() {
-    this.managementAPIClient = await managementSDKClient({ host: this._host });
+    // Ensure we have a valid host for the SDK initialization
+    const host = this._host || this.getCmaHost();
+    this.managementAPIClient = await managementSDKClient({ host });
     this.oauthHandler = this.managementAPIClient.oauth({
       appId: this.OAuthAppId,
       clientId: this.OAuthClientId,

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

@@ -38,7 +38,7 @@
     "@contentstack/cli-config": "~1.15.2",
     "@contentstack/cli-launch": "^1.9.2",
     "@contentstack/cli-migration": "~1.8.1",
-    "@contentstack/cli-utilities": "~1.14.1",
+    "@contentstack/cli-utilities": "~1.14.2",
     "@contentstack/cli-variants": "~1.3.1",
     "@contentstack/management": "~1.22.0",
     "@oclif/core": "^4.3.0",