Merge pull request #308 from contentstack/fix/DX-1292

fix: deploy command launch base url issue

Author: cs-raj

README.md

@@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/apps-cli/1.3.2 darwin-arm64 node-v18.20.2
+@contentstack/apps-cli/1.3.3 darwin-arm64 node-v18.12.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -69,7 +69,7 @@ EXAMPLES
   $ csdx app:update
 ```
 
-_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/index.ts)_
+_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/index.ts)_
 
 ## `csdx app:create`
 
@@ -109,7 +109,7 @@ EXAMPLES
   $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplate <Ecommerce App Boilerplate>
 ```
 
-_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/create.ts)_
+_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/create.ts)_
 
 ## `csdx app:delete`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ csdx app:delete --app-uid <value> --org <value> -d ./boilerplate
 ```
 
-_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/delete.ts)_
+_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/delete.ts)_
 
 ## `csdx app:deploy`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ csdx app:deploy --org <UID> --app-uid <APP-UID-1> --hosting-type <Hosting with Launch> --launch-project <new> --config <config-path>
 ```
 
-_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/deploy.ts)_
+_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/deploy.ts)_
 
 ## `csdx app:get`
 
@@ -202,7 +202,7 @@ EXAMPLES
   $ csdx app:get --org <value> --app-uid <value> --app-type organization
 ```
 
-_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/get.ts)_
+_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/get.ts)_
 
 ## `csdx app:install`
 
@@ -228,7 +228,7 @@ EXAMPLES
   $ csdx app:install --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/install.ts)_
+_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/install.ts)_
 
 ## `csdx app:reinstall`
 
@@ -254,7 +254,7 @@ EXAMPLES
   $ csdx app:reinstall --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/reinstall.ts)_
+_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/reinstall.ts)_
 
 ## `csdx app:uninstall`
 
@@ -281,7 +281,7 @@ EXAMPLES
   $ csdx app:uninstall --org <UID> --app-uid <APP-UID-1> --installation-uid <INSTALLATION-UID-1>
 ```
 
-_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/uninstall.ts)_
+_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/uninstall.ts)_
 
 ## `csdx app:update`
 
@@ -304,5 +304,5 @@ EXAMPLES
   $ csdx app:update --app-manifest ./boilerplate/manifest.json
 ```
 
-_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/update.ts)_
+_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.3/src/commands/app/update.ts)_
 <!-- commandsstop -->

package-lock.json

@@ -21,9 +21,9 @@
   ],
   "dependencies": {
     "@apollo/client": "^3.7.9",
-    "@contentstack/cli-command": "^1.2.19",
-    "@contentstack/cli-launch": "^1.0.18",
-    "@contentstack/cli-utilities": "^1.7.0",
+    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-launch": "~1.2.0",
+    "@contentstack/cli-utilities": "~1.7.0",
     "adm-zip": "^0.5.15",
     "chalk": "^4.1.2",
     "lodash": "^4.17.21",

package.json

@@ -22,6 +22,7 @@ import {
   disconnectApp,
   formatUrl,
   handleProjectNameConflict,
+  getLaunchHubUrl,
 } from "../../util";
 
 export default class Deploy extends AppCLIBaseCommand {
@@ -167,9 +168,7 @@ export default class Deploy extends AppCLIBaseCommand {
    * @returns {Promise<ApolloClient>} The Apollo Client instance.
    */
   async getApolloClient(projectUid = ""): Promise<ApolloClient<any>> {
-    const baseUrl =
-      config.launchBaseUrl ||
-      (config.launchHubUrls as Record<string, string>)[this.cmaAPIUrl];
+    const baseUrl = config.launchBaseUrl || getLaunchHubUrl();
     const manageApiBaseUrl = `${baseUrl}/${config.manageApiEndpoint}`;
     return await new GraphqlApiClient({
       headers: {

src/commands/app/deploy.ts

@@ -409,6 +409,25 @@ const validateAppName = (name: string) => {
     throw new Error($t(errors.INVALID_NAME, { min: "3", max: "20" }));
   }
 };
+
+function getLaunchHubUrl(): string {
+  const { cma } = configHandler.get('region') || {};
+  if (!cma) {
+    throw new Error('Region not configured. Please set the region with command $ csdx config:set:region');
+  }
+
+  let launchHubBaseUrl = cma.replace('api', 'launch-api');
+
+  if (launchHubBaseUrl.startsWith('http')) {
+    launchHubBaseUrl = launchHubBaseUrl.split('//')[1];
+  }
+
+  launchHubBaseUrl = launchHubBaseUrl.startsWith('dev11') ? launchHubBaseUrl.replace('dev11', 'dev') : launchHubBaseUrl;
+  launchHubBaseUrl = launchHubBaseUrl.endsWith('io') ? launchHubBaseUrl.replace('io', 'com') : launchHubBaseUrl;
+
+  return `https://${launchHubBaseUrl}`;
+}
+
 export {
   getOrg,
   getAppName,
@@ -426,4 +445,5 @@ export {
   askProjectName,
   selectedBoilerplate,
   validateAppName,
+  getLaunchHubUrl,
 };