diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81dbe62769..215e3f660f 100755 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: version: 7 - uses: actions/setup-node@v4 with: - node-version: '18.x' + node-version: '22.x' cache: 'pnpm' - name: Reading Configuration id: release_config diff --git a/package-lock.json b/package-lock.json index af0cfebd3b..9f83039711 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26756,24 +26756,24 @@ }, "packages/contentstack": { "name": "@contentstack/cli", - "version": "1.35.3", + "version": "1.35.4", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.7.5", - "@contentstack/cli-auth": "~1.3.23", + "@contentstack/cli-auth": "~1.3.24", "@contentstack/cli-cm-bootstrap": "~1.13.1", "@contentstack/cli-cm-branches": "~1.2.1", "@contentstack/cli-cm-bulk-publish": "~1.7.2", "@contentstack/cli-cm-clone": "~1.13.1", "@contentstack/cli-cm-export": "~1.14.2", "@contentstack/cli-cm-export-to-csv": "~1.7.3", - "@contentstack/cli-cm-import": "~1.19.4", + "@contentstack/cli-cm-import": "~1.19.5", "@contentstack/cli-cm-import-setup": "1.0.1", "@contentstack/cli-cm-migrate-rte": "~1.4.21", "@contentstack/cli-cm-seed": "~1.10.1", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-config": "~1.9.1", - "@contentstack/cli-launch": "^1.4.1", + "@contentstack/cli-launch": "^1.5.1", "@contentstack/cli-migration": "~1.6.5", "@contentstack/cli-utilities": "~1.8.2", "@contentstack/cli-variants": "~1.1.5", @@ -26902,7 +26902,7 @@ }, "packages/contentstack-auth": { "name": "@contentstack/cli-auth", - "version": "1.3.23", + "version": "1.3.24", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", @@ -27190,7 +27190,7 @@ "dependencies": { "@colors/colors": "^1.6.0", "@contentstack/cli-cm-export": "~1.14.2", - "@contentstack/cli-cm-import": "~1.19.4", + "@contentstack/cli-cm-import": "~1.19.5", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-utilities": "~1.8.2", "chalk": "^4.1.2", @@ -27689,7 +27689,7 @@ "winston": "^3.17.0" }, "devDependencies": { - "@contentstack/cli-auth": "~1.3.23", + "@contentstack/cli-auth": "~1.3.24", "@contentstack/cli-config": "~1.9.1", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.2.20", @@ -28022,7 +28022,7 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.19.4", + "version": "1.19.5", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.7.5", @@ -28170,7 +28170,7 @@ "version": "1.10.1", "license": "MIT", "dependencies": { - "@contentstack/cli-cm-import": "~1.19.4", + "@contentstack/cli-cm-import": "~1.19.5", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-utilities": "~1.8.2", "@contentstack/management": "~1.18.4", @@ -28310,7 +28310,7 @@ "version": "1.1.5", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "^1.8.2", + "@contentstack/cli-utilities": "~1.8.2", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.17.0" diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md index 17329804db..fa2862d525 100644 --- a/packages/contentstack-audit/README.md +++ b/packages/contentstack-audit/README.md @@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli-audit/1.7.5 darwin-arm64 node-v22.2.0 +@contentstack/cli-audit/1.7.5 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND @@ -269,7 +269,7 @@ EXAMPLES $ csdx plugins ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/index.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/index.ts)_ ## `csdx plugins:add PLUGIN` @@ -343,7 +343,7 @@ EXAMPLES $ csdx plugins:inspect myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/inspect.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/inspect.ts)_ ## `csdx plugins:install PLUGIN` @@ -392,7 +392,7 @@ EXAMPLES $ csdx plugins:install someuser/someplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/install.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/install.ts)_ ## `csdx plugins:link PATH` @@ -423,7 +423,7 @@ EXAMPLES $ csdx plugins:link myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/link.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/link.ts)_ ## `csdx plugins:remove [PLUGIN]` @@ -464,7 +464,7 @@ FLAGS --reinstall Reinstall all plugins after uninstalling. ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/reset.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/reset.ts)_ ## `csdx plugins:uninstall [PLUGIN]` @@ -492,7 +492,7 @@ EXAMPLES $ csdx plugins:uninstall myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/uninstall.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/uninstall.ts)_ ## `csdx plugins:unlink [PLUGIN]` @@ -536,5 +536,5 @@ DESCRIPTION Update installed plugins. ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/update.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/update.ts)_ diff --git a/packages/contentstack-auth/README.md b/packages/contentstack-auth/README.md index 5084891a62..340820fca4 100644 --- a/packages/contentstack-auth/README.md +++ b/packages/contentstack-auth/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-auth/1.3.23 darwin-arm64 node-v22.2.0 +@contentstack/cli-auth/1.3.24 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-auth/messages/index.json b/packages/contentstack-auth/messages/index.json index 3ec16b11cf..f4e600e87c 100644 --- a/packages/contentstack-auth/messages/index.json +++ b/packages/contentstack-auth/messages/index.json @@ -18,6 +18,8 @@ "CLI_AUTH_LOGOUT_DESCRIPTION": "User session logout", "CLI_AUTH_LOGOUT_FLAG_FORCE": "Force logging out for skipping the confirmation", "CLI_AUTH_LOGOUT_ALREADY": "You're already logged out", + "CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS": "No authorizations found", + "CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER": "No authorizations found for current user", "CLI_AUTH_WHOAMI_LOGGED_IN_AS": "You are currently logged in with email", "CLI_AUTH_WHOAMI_FAILED": "Failed to get the current user details", "CLI_AUTH_WHOAMI_DESCRIPTION": "Display current users email address", diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index f63938a787..ceea148355 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-auth", "description": "Contentstack CLI plugin for authentication activities", - "version": "1.3.23", + "version": "1.3.24", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "scripts": { diff --git a/packages/contentstack-bootstrap/README.md b/packages/contentstack-bootstrap/README.md index c2304add0d..7dd59f0985 100644 --- a/packages/contentstack-bootstrap/README.md +++ b/packages/contentstack-bootstrap/README.md @@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bootstrap/1.13.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-bootstrap/1.13.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md index ec92283204..b9a5460d66 100755 --- a/packages/contentstack-branches/README.md +++ b/packages/contentstack-branches/README.md @@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-branches/1.2.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-branches/1.2.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md index 8f2e81dee1..0f1631ad0d 100644 --- a/packages/contentstack-bulk-publish/README.md +++ b/packages/contentstack-bulk-publish/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bulk-publish/1.7.2 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-bulk-publish/1.7.2 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-clone/README.md b/packages/contentstack-clone/README.md index 39b23b6d63..d7f671a178 100644 --- a/packages/contentstack-clone/README.md +++ b/packages/contentstack-clone/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-clone/1.13.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-clone/1.13.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index c1b7dc3680..a9eabd3cdf 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -7,7 +7,7 @@ "dependencies": { "@colors/colors": "^1.6.0", "@contentstack/cli-cm-export": "~1.14.2", - "@contentstack/cli-cm-import": "~1.19.4", + "@contentstack/cli-cm-import": "~1.19.5", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-utilities": "~1.8.2", "chalk": "^4.1.2", diff --git a/packages/contentstack-config/README.md b/packages/contentstack-config/README.md index 178b74f985..ca11a8962c 100644 --- a/packages/contentstack-config/README.md +++ b/packages/contentstack-config/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-config/1.9.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-config/1.9.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-export/README.md b/packages/contentstack-export/README.md index f14fc14b83..1c8fd668e0 100755 --- a/packages/contentstack-export/README.md +++ b/packages/contentstack-export/README.md @@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-export/1.14.2 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-export/1.14.2 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index 5e89e4ed8b..b4387ab87c 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -21,7 +21,7 @@ "winston": "^3.17.0" }, "devDependencies": { - "@contentstack/cli-auth": "~1.3.23", + "@contentstack/cli-auth": "~1.3.24", "@contentstack/cli-config": "~1.9.1", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.2.20", diff --git a/packages/contentstack-import-setup/README.md b/packages/contentstack-import-setup/README.md index 7d1fdc120d..93a6e6023d 100644 --- a/packages/contentstack-import-setup/README.md +++ b/packages/contentstack-import-setup/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import-setup/1.0.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-import-setup/1.0.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md index df6522bc21..04802faceb 100644 --- a/packages/contentstack-import/README.md +++ b/packages/contentstack-import/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import/1.19.4 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-import/1.19.5 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 56435913fb..38f9ba35a2 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-import", "description": "Contentstack CLI plugin to import content into stack", - "version": "1.19.4", + "version": "1.19.5", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-import/src/config/index.ts b/packages/contentstack-import/src/config/index.ts index 10082f2d39..2489e60075 100644 --- a/packages/contentstack-import/src/config/index.ts +++ b/packages/contentstack-import/src/config/index.ts @@ -428,7 +428,7 @@ const config: DefaultConfig = { getEncryptionKeyMaxRetry: 3, // useBackedupDir: '', // backupConcurrency: 10, - onlyTSModules: ['taxonomies'], + onlyTSModules: ['taxonomies', 'personalize'], auditConfig: { noLog: false, // Skip logs printing on terminal skipConfirm: true, // Skip confirmation if any diff --git a/packages/contentstack-import/src/import/modules/entries.ts b/packages/contentstack-import/src/import/modules/entries.ts index d75e36d62d..8eb7221650 100644 --- a/packages/contentstack-import/src/import/modules/entries.ts +++ b/packages/contentstack-import/src/import/modules/entries.ts @@ -950,31 +950,38 @@ export default class EntriesImport extends BaseClass { if (chunk) { let apiContent = values(chunk as Record[]); let apiContentDuplicate: any = []; - apiContentDuplicate = apiContent.flatMap((content: Record) => - content?.publish_details?.map((publish: Record) => ({ - ...content, - locale: publish.locale, - publish_details: [publish], - })) - ); - apiContent = apiContentDuplicate; - await this.makeConcurrentCall({ - apiContent, - processName, - indexerCount, - currentIndexer: +index, - apiParams: { - reject: onReject, - resolve: onSuccess, - entity: 'publish-entries', - includeParamOnCompletion: true, - serializeData: this.serializePublishEntries.bind(this), - additionalInfo: { contentType, locale, cTUid }, - }, - concurrencyLimit: this.importConcurrency, - }).then(() => { - log(this.importConfig, `Published entries for content type ${cTUid} in locale ${locale}`, 'success'); + apiContentDuplicate = apiContent.flatMap((content: Record) => { + if (content?.publish_details?.length > 0) { + return content.publish_details.map((publish: Record) => ({ + ...content, + locale: publish.locale, + publish_details: [publish], + })); + } + return []; // Return an empty array if publish_details is empty }); + apiContent = apiContentDuplicate; + if (apiContent?.length === 0) { + continue; + } else { + await this.makeConcurrentCall({ + apiContent, + processName, + indexerCount, + currentIndexer: +index, + apiParams: { + reject: onReject, + resolve: onSuccess, + entity: 'publish-entries', + includeParamOnCompletion: true, + serializeData: this.serializePublishEntries.bind(this), + additionalInfo: { contentType, locale, cTUid }, + }, + concurrencyLimit: this.importConcurrency, + }).then(() => { + log(this.importConfig, `Published entries for content type ${cTUid} in locale ${locale}`, 'success'); + }); + } } } } @@ -1011,7 +1018,7 @@ export default class EntriesImport extends BaseClass { apiOptions.apiData = null; return apiOptions; } - if(requestObject.environments.length === 0 || requestObject.locales.length === 0 ){ + if (requestObject.environments.length === 0 || requestObject.locales.length === 0) { apiOptions.apiData = null; return apiOptions; } diff --git a/packages/contentstack-migrate-rte/README.md b/packages/contentstack-migrate-rte/README.md index daef6582d5..86133a7e18 100644 --- a/packages/contentstack-migrate-rte/README.md +++ b/packages/contentstack-migrate-rte/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-migrate-rte/1.4.21 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-migrate-rte/1.4.21 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-migration/README.md b/packages/contentstack-migration/README.md index 04c0f77f9c..c1226fe19f 100644 --- a/packages/contentstack-migration/README.md +++ b/packages/contentstack-migration/README.md @@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-migration/1.6.5 darwin-arm64 node-v22.2.0 +@contentstack/cli-migration/1.6.5 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 8983bbbcda..5b922cb964 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -5,7 +5,7 @@ "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-cm-import": "~1.19.4", + "@contentstack/cli-cm-import": "~1.19.5", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-utilities": "~1.8.2", "@contentstack/management": "~1.18.4", diff --git a/packages/contentstack-utilities/src/auth-handler.ts b/packages/contentstack-utilities/src/auth-handler.ts index 8ca247621a..c7ea85be79 100644 --- a/packages/contentstack-utilities/src/auth-handler.ts +++ b/packages/contentstack-utilities/src/auth-handler.ts @@ -7,7 +7,7 @@ import messageHandler from './message-handler'; const http = require('http'); const url = require('url'); import open from 'open'; -import {LoggerService} from './logger'; +import { LoggerService } from './logger'; const crypto = require('crypto'); dotenv.config(); @@ -16,6 +16,7 @@ dotenv.config(); * Auth handler */ class AuthHandler { + private developerHubUrl: string; private _host; private codeVerifier: string; private OAuthBaseURL: string; @@ -35,7 +36,7 @@ class AuthHandler { private authorisationTypeOAUTHValue: string; private authorisationTypeAUTHValue: string; private allAuthConfigItems: any; - private logger:any; + private logger: any; set host(contentStackHost) { this._host = contentStackHost; } @@ -89,6 +90,21 @@ class AuthHandler { } } + setDeveloperHubURL() { + if (this.developerHubUrl) { + return; // Return if already set + } + + if (configHandler.get('region')['developerHubUrl']) { + this.developerHubUrl = configHandler.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 @@ -239,10 +255,10 @@ class AuthHandler { redirect_uri: this.OAuthRedirectURL, code: code, }; - this.setOAuthBaseURL(); + this.setDeveloperHubURL(); const httpClient = new HttpClient().headers(headers).asFormParams(); httpClient - .post(`${this.OAuthBaseURL}/apps-api/apps/token`, payload) + .post(`${this.developerHubUrl}/apps/token`, payload) .then(({ data }) => { return this.getUserDetails(data); }) @@ -351,10 +367,10 @@ class AuthHandler { redirect_uri: this.OAuthRedirectURL, refresh_token: configOauthRefreshToken, }; - this.setOAuthBaseURL(); + this.setDeveloperHubURL(); const httpClient = new HttpClient().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 = ''; @@ -416,9 +432,9 @@ class AuthHandler { } async oauthLogout(): Promise { - const authorization: string = await this.getOauthAppAuthorization() || ""; - const response: {} = await this.revokeOauthAppAuthorization(authorization) - return response || {} + const authorization: string = (await this.getOauthAppAuthorization()) || ''; + const response: {} = await this.revokeOauthAppAuthorization(authorization); + return response || {}; } /** @@ -429,24 +445,22 @@ class AuthHandler { const headers = { authorization: `Bearer ${configHandler.get(this.oauthAccessTokenKeyName)}`, organization_uid: configHandler.get(this.oauthOrgUidKeyName), - 'Content-type': 'application/json' - } - const httpClient = new HttpClient().headers(headers) - await this.setOAuthBaseURL(); - return httpClient - .get(`${this.OAuthBaseURL}/apps-api/manifests/${this.OAuthAppId}/authorizations`) - .then(({data}) => { - if (data?.data?.length > 0) { - const userUid = configHandler.get(this.oauthUserUidKeyName) - const currentUserAuthorization = data?.data?.filter(element => element.user.uid === userUid) || []; - if (currentUserAuthorization.length === 0) { - throw new Error(messageHandler.parse("CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER")) - } - return currentUserAuthorization[0].authorization_uid // filter authorizations by current logged in user - } else { - throw new Error(messageHandler.parse("CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS")) + 'Content-type': 'application/json', + }; + const httpClient = new HttpClient().headers(headers); + this.setDeveloperHubURL(); + return httpClient.get(`${this.developerHubUrl}/manifests/${this.OAuthAppId}/authorizations`).then(({ data }) => { + if (data?.data?.length > 0) { + const userUid = configHandler.get(this.oauthUserUidKeyName); + const currentUserAuthorization = data?.data?.filter((element) => element.user.uid === userUid) || []; + if (currentUserAuthorization.length === 0) { + throw new Error(messageHandler.parse('CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER')); } - }) + return currentUserAuthorization[0].authorization_uid; // filter authorizations by current logged in user + } else { + throw new Error(messageHandler.parse('CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS')); + } + }); } async revokeOauthAppAuthorization(authorizationId): Promise { @@ -454,15 +468,15 @@ class AuthHandler { const headers = { authorization: `Bearer ${configHandler.get(this.oauthAccessTokenKeyName)}`, organization_uid: configHandler.get(this.oauthOrgUidKeyName), - 'Content-type': 'application/json' - } - const httpClient = new HttpClient().headers(headers) - await this.setOAuthBaseURL(); + 'Content-type': 'application/json', + }; + const httpClient = new HttpClient().headers(headers); + this.setDeveloperHubURL(); return httpClient - .delete(`${this.OAuthBaseURL}/apps-api/manifests/${this.OAuthAppId}/authorizations/${authorizationId}`) - .then(({data}) => { - return data - }) + .delete(`${this.developerHubUrl}/manifests/${this.OAuthAppId}/authorizations/${authorizationId}`) + .then(({ data }) => { + return data; + }); } } diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json index 0bf7d1f08f..0b32adcc43 100644 --- a/packages/contentstack-variants/package.json +++ b/packages/contentstack-variants/package.json @@ -26,7 +26,7 @@ "typescript": "^5.7.3" }, "dependencies": { - "@contentstack/cli-utilities": "^1.8.2", + "@contentstack/cli-utilities": "~1.8.2", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.17.0" diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md index 16f785536b..5b90aaa9bd 100644 --- a/packages/contentstack/README.md +++ b/packages/contentstack/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli/1.35.3 darwin-arm64 node-v22.13.1 +@contentstack/cli/1.35.4 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index c20038ca7e..c0fa86856f 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli", "description": "Command-line tool (CLI) to interact with Contentstack", - "version": "1.35.3", + "version": "1.35.4", "author": "Contentstack", "bin": { "csdx": "./bin/run.js" @@ -23,20 +23,20 @@ }, "dependencies": { "@contentstack/cli-audit": "~1.7.5", - "@contentstack/cli-auth": "~1.3.23", + "@contentstack/cli-auth": "~1.3.24", "@contentstack/cli-cm-bootstrap": "~1.13.1", "@contentstack/cli-cm-branches": "~1.2.1", "@contentstack/cli-cm-bulk-publish": "~1.7.2", "@contentstack/cli-cm-clone": "~1.13.1", "@contentstack/cli-cm-export": "~1.14.2", "@contentstack/cli-cm-export-to-csv": "~1.7.3", - "@contentstack/cli-cm-import": "~1.19.4", + "@contentstack/cli-cm-import": "~1.19.5", "@contentstack/cli-cm-import-setup": "1.0.1", "@contentstack/cli-cm-migrate-rte": "~1.4.21", "@contentstack/cli-cm-seed": "~1.10.1", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-config": "~1.9.1", - "@contentstack/cli-launch": "^1.4.1", + "@contentstack/cli-launch": "^1.5.1", "@contentstack/cli-migration": "~1.6.5", "@contentstack/cli-utilities": "~1.8.2", "@contentstack/cli-variants": "~1.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ceff31355c..49f8cdc08f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,20 +11,20 @@ importers: packages/contentstack: specifiers: '@contentstack/cli-audit': ~1.7.5 - '@contentstack/cli-auth': ~1.3.23 + '@contentstack/cli-auth': ~1.3.24 '@contentstack/cli-cm-bootstrap': ~1.13.1 '@contentstack/cli-cm-branches': ~1.2.1 '@contentstack/cli-cm-bulk-publish': ~1.7.2 '@contentstack/cli-cm-clone': ~1.13.1 '@contentstack/cli-cm-export': ~1.14.2 '@contentstack/cli-cm-export-to-csv': ~1.7.3 - '@contentstack/cli-cm-import': ~1.19.4 + '@contentstack/cli-cm-import': ~1.19.5 '@contentstack/cli-cm-import-setup': 1.0.1 '@contentstack/cli-cm-migrate-rte': ~1.4.21 '@contentstack/cli-cm-seed': ~1.10.1 '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-config': ~1.9.1 - '@contentstack/cli-launch': ^1.4.1 + '@contentstack/cli-launch': ^1.5.1 '@contentstack/cli-migration': ~1.6.5 '@contentstack/cli-utilities': ~1.8.2 '@contentstack/cli-variants': ~1.1.5 @@ -364,7 +364,7 @@ importers: specifiers: '@colors/colors': ^1.6.0 '@contentstack/cli-cm-export': ~1.14.2 - '@contentstack/cli-cm-import': ~1.19.4 + '@contentstack/cli-cm-import': ~1.19.5 '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-utilities': ~1.8.2 '@oclif/test': ^4.1.6 @@ -506,7 +506,7 @@ importers: packages/contentstack-export: specifiers: - '@contentstack/cli-auth': ~1.3.23 + '@contentstack/cli-auth': ~1.3.24 '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-config': ~1.9.1 '@contentstack/cli-dev-dependencies': ~1.2.4 @@ -824,7 +824,7 @@ importers: packages/contentstack-seed: specifiers: - '@contentstack/cli-cm-import': ~1.19.4 + '@contentstack/cli-cm-import': ~1.19.5 '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-utilities': ~1.8.2 '@contentstack/management': ~1.18.4 @@ -965,7 +965,7 @@ importers: packages/contentstack-variants: specifiers: '@contentstack/cli-dev-dependencies': ^1.2.4 - '@contentstack/cli-utilities': ^1.8.2 + '@contentstack/cli-utilities': ~1.8.2 '@oclif/test': ^4.1.9 '@types/node': ^20.17.17 lodash: ^4.17.21