@contentstack/cli-utilities 1.8.2 → 1.8.4

package/lib/auth-handler.d.ts

@@ -3,6 +3,7 @@
  * Auth handler
  */
 declare class AuthHandler {
+    private developerHubUrl;
     private _host;
     private codeVerifier;
     private OAuthBaseURL;
@@ -27,6 +28,7 @@ declare class AuthHandler {
     constructor();
     initLog(): void;
     setOAuthBaseURL(): Promise<void>;
+    setDeveloperHubURL(): void;
     oauth(): Promise<object>;
     createHTTPServer(): Promise<object>;
     openOAuthURL(): Promise<object>;

package/lib/auth-handler.js

@@ -69,6 +69,17 @@ class AuthHandler {
             throw new Error('Invalid ui-host URL while authenticating. Please set your region correctly using the command - csdx config:set:region');
         }
     }
+    setDeveloperHubURL() {
+        if (this.developerHubUrl) {
+            return; // Return if already set
+        }
+        if (config_handler_1.default.get('region')['developerHubUrl']) {
+            this.developerHubUrl = config_handler_1.default.get('region')['developerHubUrl'] || '';
+        }
+        else {
+            throw new Error('Invalid developerHubUrl URL while authenticating. Please set your region correctly using the command - csdx config:set:region');
+        }
+    }
     /*
      *
      * Login into Contentstack
@@ -204,10 +215,10 @@ class AuthHandler {
                 redirect_uri: this.OAuthRedirectURL,
                 code: code,
             };
-            this.setOAuthBaseURL();
+            this.setDeveloperHubURL();
             const httpClient = new http_client_1.default().headers(headers).asFormParams();
             httpClient
-                .post(`${this.OAuthBaseURL}/apps-api/apps/token`, payload)
+                .post(`${this.developerHubUrl}/apps/token`, payload)
                 .then(({ data }) => {
                 return this.getUserDetails(data);
             })
@@ -311,10 +322,10 @@ class AuthHandler {
                     redirect_uri: this.OAuthRedirectURL,
                     refresh_token: configOauthRefreshToken,
                 };
-                this.setOAuthBaseURL();
+                this.setDeveloperHubURL();
                 const httpClient = new http_client_1.default().headers(headers).asFormParams();
                 httpClient
-                    .post(`${this.OAuthBaseURL}/apps-api/apps/token`, payload)
+                    .post(`${this.developerHubUrl}/apps/token`, payload)
                     .then(({ data }) => {
                     if (data.error || (data.statusCode != 200 && data.message)) {
                         let errorMessage = '';
@@ -379,7 +390,7 @@ class AuthHandler {
         });
     }
     async oauthLogout() {
-        const authorization = await this.getOauthAppAuthorization() || "";
+        const authorization = (await this.getOauthAppAuthorization()) || '';
         const response = await this.revokeOauthAppAuthorization(authorization);
         return response || {};
     }
@@ -391,24 +402,22 @@ class AuthHandler {
         const headers = {
             authorization: `Bearer ${config_handler_1.default.get(this.oauthAccessTokenKeyName)}`,
             organization_uid: config_handler_1.default.get(this.oauthOrgUidKeyName),
-            'Content-type': 'application/json'
+            'Content-type': 'application/json',
         };
         const httpClient = new http_client_1.default().headers(headers);
-        await this.setOAuthBaseURL();
-        return httpClient
-            .get(`${this.OAuthBaseURL}/apps-api/manifests/${this.OAuthAppId}/authorizations`)
-            .then(({ data }) => {
+        this.setDeveloperHubURL();
+        return httpClient.get(`${this.developerHubUrl}/manifests/${this.OAuthAppId}/authorizations`).then(({ data }) => {
             var _a, _b;
             if (((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.length) > 0) {
                 const userUid = config_handler_1.default.get(this.oauthUserUidKeyName);
-                const currentUserAuthorization = ((_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.filter(element => element.user.uid === userUid)) || [];
+                const currentUserAuthorization = ((_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.filter((element) => element.user.uid === userUid)) || [];
                 if (currentUserAuthorization.length === 0) {
-                    throw new Error(message_handler_1.default.parse("CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER"));
+                    throw new Error(message_handler_1.default.parse('CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER'));
                 }
                 return currentUserAuthorization[0].authorization_uid; // filter authorizations by current logged in user
             }
             else {
-                throw new Error(message_handler_1.default.parse("CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS"));
+                throw new Error(message_handler_1.default.parse('CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS'));
             }
         });
     }
@@ -417,12 +426,12 @@ class AuthHandler {
             const headers = {
                 authorization: `Bearer ${config_handler_1.default.get(this.oauthAccessTokenKeyName)}`,
                 organization_uid: config_handler_1.default.get(this.oauthOrgUidKeyName),
-                'Content-type': 'application/json'
+                'Content-type': 'application/json',
             };
             const httpClient = new http_client_1.default().headers(headers);
-            await this.setOAuthBaseURL();
+            this.setDeveloperHubURL();
             return httpClient
-                .delete(`${this.OAuthBaseURL}/apps-api/manifests/${this.OAuthAppId}/authorizations/${authorizationId}`)
+                .delete(`${this.developerHubUrl}/manifests/${this.OAuthAppId}/authorizations/${authorizationId}`)
                 .then(({ data }) => {
                 return data;
             });

package/lib/helpers.d.ts

@@ -16,5 +16,5 @@ export declare const escapeRegExp: (str: string) => string;
 export declare const sanitizePath: (str: string) => string;
 export declare const validateUids: (uid: any) => boolean;
 export declare const validateFileName: (fileName: any) => boolean;
-export declare const validateRegex: (str: any) => import("recheck").Diagnostics;
+export declare const validateRegex: (str: unknown) => import("recheck").Diagnostics;
 export declare const formatError: (error: any) => any;

package/lib/helpers.js

@@ -71,7 +71,10 @@ exports.validateUids = validateUids;
 const validateFileName = (fileName) => /^[a-zA-Z0-9-_\.]+$/.test(fileName);
 exports.validateFileName = validateFileName;
 // Validate Regex for ReDDos
-const validateRegex = (str) => (0, recheck_1.checkSync)(str, '');
+const validateRegex = (str) => {
+    const stringValue = typeof str === 'string' ? str : str.toString();
+    return (0, recheck_1.checkSync)(stringValue, '');
+};
 exports.validateRegex = validateRegex;
 const formatError = function (error) {
     let parsedError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,7 +35,7 @@
     "@contentstack/management": "~1.18.4",
     "@contentstack/marketplace-sdk": "^1.2.5",
     "@oclif/core": "^3.27.0",
-    "axios": "^1.7.9",
+    "axios": "^1.8.2",
     "chalk": "^4.1.2",
     "cli-cursor": "^3.1.0",
     "cli-table": "^0.3.11",
@@ -50,7 +50,7 @@
     "mkdirp": "^1.0.4",
     "open": "^8.4.2",
     "ora": "^5.4.1",
-    "recheck": "^4.4.5",
+    "recheck": "~4.4.5",
     "rxjs": "^6.6.7",
     "traverse": "^0.6.11",
     "unique-string": "^2.0.0",