From 1ffc126898bf7bce22c0160bdd47631adef12a6e Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Wed, 5 Jun 2024 15:54:28 +0530 Subject: [PATCH 1/8] feat: :recycle: removed old api calls and added new marketplace sdk calls --- src/base-command.ts | 2 ++ src/commands/app/create.ts | 4 ++-- src/util/common-utils.ts | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/base-command.ts b/src/base-command.ts index 6ab435e..4b7d655 100644 --- a/src/base-command.ts +++ b/src/base-command.ts @@ -14,6 +14,7 @@ import { cliux, isAuthenticated, } from "@contentstack/cli-utilities"; +import { ContentstackClient as MarketplaceContentstackClient } from "@contentstack/marketplace-sdk"; import config from "./config"; import { ConfigType, LogFn } from "./types"; @@ -39,6 +40,7 @@ export abstract class BaseCommand extends Command { }; protected managementSdk!: ContentstackClient; protected managementAppSdk!: ContentstackClient; + protected marketplaceAppSdk!: MarketplaceContentstackClient; protected flags!: Flags; protected args!: Args; diff --git a/src/commands/app/create.ts b/src/commands/app/create.ts index 38471b0..eca0ba8 100644 --- a/src/commands/app/create.ts +++ b/src/commands/app/create.ts @@ -266,8 +266,8 @@ export default class Create extends BaseCommand { appName: this.sharedConfig.appName, }) ); - await this.managementAppSdk - .organization(this.sharedConfig.org) + await this.marketplaceAppSdk + .marketplace(this.sharedConfig.org) .app() .create(this.appData as AppData) .then((response) => { diff --git a/src/util/common-utils.ts b/src/util/common-utils.ts index 6a843e2..6ad5f15 100644 --- a/src/util/common-utils.ts +++ b/src/util/common-utils.ts @@ -1,4 +1,5 @@ import { ContentstackClient, FlagInput } from "@contentstack/cli-utilities"; +import { ContentstackClient as MarketplaceContentstackClient } from "@contentstack/marketplace-sdk"; import { AppLocation, Extension, LogFn } from "../types"; import { cliux, Stack } from "@contentstack/cli-utilities"; import { apiRequestHandler } from "./api-request-handler"; @@ -7,6 +8,10 @@ export type CommonOptions = { log: LogFn; managementSdk: ContentstackClient; }; +export type MarketPlaceOptions = { + log: LogFn; + marketplaceSdk: MarketplaceContentstackClient; +}; async function getOrganizations( options: CommonOptions, From bd7e2cf6f7abcc03c0cf5ead3c5248c22ceadf59 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Wed, 5 Jun 2024 17:12:34 +0530 Subject: [PATCH 2/8] fix: used marketplace client from cli-utilities for initialization --- src/base-command.ts | 14 ++++++++++++-- src/util/common-utils.ts | 5 ++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/base-command.ts b/src/base-command.ts index 4b7d655..1cb1f74 100644 --- a/src/base-command.ts +++ b/src/base-command.ts @@ -13,8 +13,10 @@ import { InquirePayload, cliux, isAuthenticated, + ContentstackMarketplaceClient, + marketplaceSDKInitiator, + marketplaceSDKClient, } from "@contentstack/cli-utilities"; -import { ContentstackClient as MarketplaceContentstackClient } from "@contentstack/marketplace-sdk"; import config from "./config"; import { ConfigType, LogFn } from "./types"; @@ -40,7 +42,7 @@ export abstract class BaseCommand extends Command { }; protected managementSdk!: ContentstackClient; protected managementAppSdk!: ContentstackClient; - protected marketplaceAppSdk!: MarketplaceContentstackClient; + protected marketplaceAppSdk!: ContentstackMarketplaceClient; protected flags!: Flags; protected args!: Args; @@ -74,6 +76,7 @@ export abstract class BaseCommand extends Command { this.developerHubBaseUrl = this.sharedConfig.developerHubBaseUrl || getDeveloperHubUrl(); await this.initCmaSDK(); + await this.initMarketplaceSDK(); // Init logger const logger = new Logger(this.sharedConfig); @@ -128,6 +131,13 @@ export abstract class BaseCommand extends Command { host: this.developerHubBaseUrl, }); } + + async initMarketplaceSDK() { + marketplaceSDKInitiator.init(this.context); + this.marketplaceAppSdk = await marketplaceSDKClient({ + host: this.developerHubBaseUrl, + }); + } /** * @method getValPrompt diff --git a/src/util/common-utils.ts b/src/util/common-utils.ts index 6ad5f15..1731094 100644 --- a/src/util/common-utils.ts +++ b/src/util/common-utils.ts @@ -1,5 +1,4 @@ -import { ContentstackClient, FlagInput } from "@contentstack/cli-utilities"; -import { ContentstackClient as MarketplaceContentstackClient } from "@contentstack/marketplace-sdk"; +import { ContentstackClient, FlagInput, ContentstackMarketplaceClient } from "@contentstack/cli-utilities"; import { AppLocation, Extension, LogFn } from "../types"; import { cliux, Stack } from "@contentstack/cli-utilities"; import { apiRequestHandler } from "./api-request-handler"; @@ -10,7 +9,7 @@ export type CommonOptions = { }; export type MarketPlaceOptions = { log: LogFn; - marketplaceSdk: MarketplaceContentstackClient; + marketplaceSdk: ContentstackMarketplaceClient; }; async function getOrganizations( From a4d8d20862dc1398322df45ea6538b81284d3a49 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Thu, 6 Jun 2024 12:46:36 +0530 Subject: [PATCH 3/8] feat: updated old install api call to new marketplace api call --- .gitignore | 2 -- src/commands/app/install.ts | 2 +- src/messages/index.ts | 2 +- src/util/common-utils.ts | 8 ++++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9828920..9761729 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,3 @@ dependabot.yml oclif.manifest.json *.env .vscode/ -/app-boilerplate -/app-boilerplate+1 \ No newline at end of file diff --git a/src/commands/app/install.ts b/src/commands/app/install.ts index 9223286..323e3d9 100644 --- a/src/commands/app/install.ts +++ b/src/commands/app/install.ts @@ -108,7 +108,7 @@ export default class Install extends AppCLIBaseCommand { "info" ); await installApp(this.flags, this.sharedConfig.org, appType, { - managementSdk: this.managementAppSdk, + marketplaceSdk: this.marketplaceAppSdk, log: this.log, }); this.log( diff --git a/src/messages/index.ts b/src/messages/index.ts index 739c54e..d83e1e9 100644 --- a/src/messages/index.ts +++ b/src/messages/index.ts @@ -25,7 +25,7 @@ const errors = { const commonMsg = { CONFIG: "Path of the external config", MAX_RETRY_LIMIT: "Maximum retry limit reached.", - PROVIDE_ORG_UID: "Provide the organization UID to fetch the app details for the desired operation.", + PROVIDE_ORG_UID: "Provide the organization UID to fetch the app details for the operation.", CURRENT_WORKING_DIR: "Current working directory.", SKIP_CONFIRMATION: "Use this flag to skip the confirmation.", DEVELOPER_HUB_URL_PROMPT: diff --git a/src/util/common-utils.ts b/src/util/common-utils.ts index 1731094..b0f570b 100644 --- a/src/util/common-utils.ts +++ b/src/util/common-utils.ts @@ -127,11 +127,11 @@ function installApp( flags: FlagInput, orgUid: string, type: string, - options: CommonOptions + options: MarketPlaceOptions ) { - const { managementSdk } = options; - return managementSdk - .organization(orgUid) + const { marketplaceSdk } = options; + return marketplaceSdk + .marketplace(orgUid) .app(flags["app-uid"] as any) .install({ targetUid: (flags["stack-api-key"] as any) || orgUid, From 4fab8837ec3ac5c19d46bd6634bab3d2f89e5389 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Thu, 6 Jun 2024 12:49:35 +0530 Subject: [PATCH 4/8] docs: updated org_uid description --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 36f3e9f..96d33b6 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/apps-cli/1.1.0 darwin-arm64 node-v18.17.0 +@contentstack/apps-cli/1.1.0 darwin-arm64 node-v18.16.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND @@ -82,7 +82,7 @@ FLAGS -n, --name= [default: app-boilerplate] Name of the app to be created --app-type=