From 3f23e7ab182d5f2233fce8b7556c8d7433148405 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Mon, 5 Feb 2024 15:02:23 +0530
Subject: [PATCH 01/12] added the developerhub urls and version bump

---
 package-lock.json                                 | 14 +++++++-------
 packages/contentstack-clone/package.json          |  4 ++--
 packages/contentstack-export/package.json         |  2 +-
 .../contentstack-export/src/utils/interactive.ts  | 15 +--------------
 .../src/utils/marketplace-app-helper.ts           |  5 +++--
 packages/contentstack-import/package.json         |  2 +-
 .../contentstack-import/src/utils/interactive.ts  | 11 -----------
 .../src/utils/marketplace-app-helper.ts           |  6 +++---
 packages/contentstack-seed/package.json           |  2 +-
 packages/contentstack/package.json                |  4 ++--
 pnpm-lock.yaml                                    | 10 +++++-----
 11 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8af6099849..1c56942480 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23549,9 +23549,9 @@
         "@contentstack/cli-cm-branches": "~1.0.22",
         "@contentstack/cli-cm-bulk-publish": "~1.4.0",
         "@contentstack/cli-cm-clone": "~1.10.0",
-        "@contentstack/cli-cm-export": "~1.10.4",
+        "@contentstack/cli-cm-export": "~1.10.5",
         "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-cm-migrate-rte": "~1.4.15",
         "@contentstack/cli-cm-seed": "~1.7.1",
         "@contentstack/cli-command": "~1.2.17",
@@ -24092,8 +24092,8 @@
       "license": "MIT",
       "dependencies": {
         "@colors/colors": "^1.5.0",
-        "@contentstack/cli-cm-export": "~1.10.4",
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-export": "~1.10.5",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "async": "^3.2.4",
@@ -24525,7 +24525,7 @@
     },
     "packages/contentstack-export": {
       "name": "@contentstack/cli-cm-export",
-      "version": "1.10.4",
+      "version": "1.10.5",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
@@ -24993,7 +24993,7 @@
     },
     "packages/contentstack-import": {
       "name": "@contentstack/cli-cm-import",
-      "version": "1.13.3",
+      "version": "1.13.4",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-audit": "^1.3.5",
@@ -25472,7 +25472,7 @@
       "version": "1.7.1",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "inquirer": "8.2.4",
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
index de90d23501..fcbd24afa4 100644
--- a/packages/contentstack-clone/package.json
+++ b/packages/contentstack-clone/package.json
@@ -5,8 +5,8 @@
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "~1.10.4",
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-export": "~1.10.5",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "@colors/colors": "^1.5.0",
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
index 2b54eea5f8..a2bde1bc8a 100644
--- a/packages/contentstack-export/package.json
+++ b/packages/contentstack-export/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
diff --git a/packages/contentstack-export/src/utils/interactive.ts b/packages/contentstack-export/src/utils/interactive.ts
index 3004901136..6b129e1476 100644
--- a/packages/contentstack-export/src/utils/interactive.ts
+++ b/packages/contentstack-export/src/utils/interactive.ts
@@ -63,17 +63,4 @@ export const askAPIKey = async (): Promise<string> => {
     message: 'Enter the stack api key',
     name: 'apiKey',
   });
-};
-
-export const askDeveloperHub = async(regionName: string): Promise<string> =>{
-  return await cliux.inquire({
-    type: 'input',
-    name: 'name',
-    validate: (url: string) => {
-      if (!url) return "Developer-hub URL can't be empty.";
-  
-      return true;
-    },
-    message: `Enter the developer-hub base URL for the ${regionName} region - `,
-  });
-}
+};
\ No newline at end of file
diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
index b96db792ab..5dad11cb98 100644
--- a/packages/contentstack-export/src/utils/marketplace-app-helper.ts
+++ b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
@@ -2,16 +2,17 @@ import { cliux, configHandler, NodeCrypto, managementSDKClient } from '@contents
 
 import { formatError, log } from '../utils';
 import { ExportConfig } from '../types';
-import { askDeveloperHub } from './interactive';
 
 export const getDeveloperHubUrl = async (exportConfig: ExportConfig) => {
   const { cma, name } = configHandler.get('region') || {};
   let developerHubBaseUrl = exportConfig?.developerHubUrls[cma];
 
   if (!developerHubBaseUrl) {
-    developerHubBaseUrl = await askDeveloperHub(name);
+    developerHubBaseUrl = exportConfig.host?.replace('api','develperhub-api');
   }
 
+  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl
+  
   return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
 };
 
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
index dc5c4aa3cb..66120d55d8 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.13.3",
+  "version": "1.13.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
diff --git a/packages/contentstack-import/src/utils/interactive.ts b/packages/contentstack-import/src/utils/interactive.ts
index c949030275..42a4703964 100644
--- a/packages/contentstack-import/src/utils/interactive.ts
+++ b/packages/contentstack-import/src/utils/interactive.ts
@@ -20,17 +20,6 @@ export const askAPIKey = async (): Promise<string> => {
   });
 };
 
-export const askDeveloperHubUrl = async (regionName: string): Promise<string> => {
-  return await cliux.inquire({
-    type: 'input',
-    name: 'name',
-    validate: (url) => {
-      if (!url) return "Developer-hub URL can't be empty.";
-      return true;
-    },
-    message: `Enter the developer-hub base URL for the ${regionName} region -`,
-  });
-};
 
 export const askEncryptionKey = async(defaultValue: unknown): Promise<string> => {
   return await cliux.inquire({
diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts
index e789633796..8186f0d349 100644
--- a/packages/contentstack-import/src/utils/marketplace-app-helper.ts
+++ b/packages/contentstack-import/src/utils/marketplace-app-helper.ts
@@ -15,7 +15,6 @@ import { log } from './logger';
 import { trace } from '../utils/log';
 import { ImportConfig, Installation } from '../types';
 import { formatError } from '../utils';
-import { askDeveloperHubUrl } from './interactive';
 import { getAppName, askAppName, selectConfiguration } from '../utils/interactive';
 
 export const getAllStackSpecificApps = async (
@@ -57,10 +56,11 @@ export const getAllStackSpecificApps = async (
 export const getDeveloperHubUrl = async (config: ImportConfig): Promise<string> => {
   const { cma, name } = configHandler.get('region') || {};
   let developerHubBaseUrl = config.developerHubUrls[cma];
-
+  
   if (!developerHubBaseUrl) {
-    developerHubBaseUrl = await askDeveloperHubUrl(name);
+    developerHubBaseUrl = config.host?.replace('api','developerhub-api');
   }
+  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl
 
   return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
 };
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
index 2322efead6..c279ba12ca 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.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
index a4dcfad222..e03f890df0 100755
--- a/packages/contentstack/package.json
+++ b/packages/contentstack/package.json
@@ -28,9 +28,9 @@
     "@contentstack/cli-cm-branches": "~1.0.22",
     "@contentstack/cli-cm-bulk-publish": "~1.4.0",
     "@contentstack/cli-cm-clone": "~1.10.0",
-    "@contentstack/cli-cm-export": "~1.10.4",
+    "@contentstack/cli-cm-export": "~1.10.5",
     "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.1",
     "@contentstack/cli-command": "~1.2.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1031c54d4a..cfbeac1257 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,9 +16,9 @@ importers:
       '@contentstack/cli-cm-branches': ~1.0.22
       '@contentstack/cli-cm-bulk-publish': ~1.4.0
       '@contentstack/cli-cm-clone': ~1.10.0
-      '@contentstack/cli-cm-export': ~1.10.4
+      '@contentstack/cli-cm-export': ~1.10.5
       '@contentstack/cli-cm-export-to-csv': ~1.6.2
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-cm-migrate-rte': ~1.4.15
       '@contentstack/cli-cm-seed': ~1.7.1
       '@contentstack/cli-command': ~1.2.17
@@ -423,8 +423,8 @@ importers:
   packages/contentstack-clone:
     specifiers:
       '@colors/colors': ^1.5.0
-      '@contentstack/cli-cm-export': ~1.10.4
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-export': ~1.10.5
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@oclif/test': ^2.5.6
@@ -990,7 +990,7 @@ importers:
 
   packages/contentstack-seed:
     specifiers:
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@oclif/plugin-help': ^5.1.19

From 89e05a861133c428a36557a7612218b44299d0c0 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Mon, 5 Feb 2024 16:12:34 +0530
Subject: [PATCH 02/12] fixed type

---
 .../contentstack-export/src/utils/marketplace-app-helper.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
index 5dad11cb98..0166780647 100644
--- a/packages/contentstack-export/src/utils/marketplace-app-helper.ts
+++ b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
@@ -8,7 +8,7 @@ export const getDeveloperHubUrl = async (exportConfig: ExportConfig) => {
   let developerHubBaseUrl = exportConfig?.developerHubUrls[cma];
 
   if (!developerHubBaseUrl) {
-    developerHubBaseUrl = exportConfig.host?.replace('api','develperhub-api');
+    developerHubBaseUrl = exportConfig.host?.replace('api','developerhub-api');
   }
 
   developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl

From c6bf928069f2e105b4c0d6e9592a34284571e22e Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Tue, 6 Feb 2024 17:09:05 +0530
Subject: [PATCH 03/12] moved the developerhuburl to utilites

---
 .../src/utils/marketplace-app-helper.ts             | 13 ++-----------
 .../src/utils/marketplace-app-helper.ts             | 11 ++---------
 packages/contentstack-utilities/src/helpers.ts      |  6 ++++++
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
index 0166780647..670adab051 100644
--- a/packages/contentstack-export/src/utils/marketplace-app-helper.ts
+++ b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
@@ -1,19 +1,10 @@
-import { cliux, configHandler, NodeCrypto, managementSDKClient } from '@contentstack/cli-utilities';
+import { cliux, configHandler, NodeCrypto, managementSDKClient, createDeveloperHubUrl } from '@contentstack/cli-utilities';
 
 import { formatError, log } from '../utils';
 import { ExportConfig } from '../types';
 
 export const getDeveloperHubUrl = async (exportConfig: ExportConfig) => {
-  const { cma, name } = configHandler.get('region') || {};
-  let developerHubBaseUrl = exportConfig?.developerHubUrls[cma];
-
-  if (!developerHubBaseUrl) {
-    developerHubBaseUrl = exportConfig.host?.replace('api','developerhub-api');
-  }
-
-  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl
-  
-  return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
+  return createDeveloperHubUrl(exportConfig.host);
 };
 
 export async function getOrgUid(config: ExportConfig): Promise<string> {
diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts
index 8186f0d349..dca299e706 100644
--- a/packages/contentstack-import/src/utils/marketplace-app-helper.ts
+++ b/packages/contentstack-import/src/utils/marketplace-app-helper.ts
@@ -9,6 +9,7 @@ import {
   configHandler,
   managementSDKClient,
   marketplaceSDKClient,
+  createDeveloperHubUrl
 } from '@contentstack/cli-utilities';
 
 import { log } from './logger';
@@ -54,15 +55,7 @@ export const getAllStackSpecificApps = async (
 };
 
 export const getDeveloperHubUrl = async (config: ImportConfig): Promise<string> => {
-  const { cma, name } = configHandler.get('region') || {};
-  let developerHubBaseUrl = config.developerHubUrls[cma];
-  
-  if (!developerHubBaseUrl) {
-    developerHubBaseUrl = config.host?.replace('api','developerhub-api');
-  }
-  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl
-
-  return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
+  return createDeveloperHubUrl(config.host);
 };
 
 export const getOrgUid = async (config: ImportConfig): Promise<string> => {
diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts
index 30c1b43bf0..cacf0659f2 100644
--- a/packages/contentstack-utilities/src/helpers.ts
+++ b/packages/contentstack-utilities/src/helpers.ts
@@ -24,4 +24,10 @@ export const isManagementTokenValid = async (stackAPIKey, managementToken) => {
   } catch (error) {
     return { valid: 'failedToCheck',message:`Failed to check the validity of the Management token. ${error}`};
   }
+}
+
+export const createDeveloperHubUrl = (developerHubBaseUrl:string) : string => {
+  developerHubBaseUrl = developerHubBaseUrl?.replace('api','developerhub-api');
+  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')?developerHubBaseUrl.replace('dev11','dev'):developerHubBaseUrl;
+  return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
 }
\ No newline at end of file

From 03bedd2980d304973a6ac4897f3e9743f87c1403 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Tue, 6 Feb 2024 17:29:13 +0530
Subject: [PATCH 04/12] handled why logs where not created in mentioned path

---
 .../contentstack-export/src/commands/cm/stacks/export.ts     | 5 ++---
 packages/contentstack-export/src/utils/logger.ts             | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
index 805a420f16..86b0f0ebf3 100644
--- a/packages/contentstack-export/src/commands/cm/stacks/export.ts
+++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -98,7 +98,7 @@ export default class ExportCommand extends Command {
   static aliases: string[] = ['cm:export'];
 
   async run(): Promise<void> {
-    let exportDir: string;
+    let exportDir: string = path.join(__dirname, 'logs');
     try {
       const { flags } = await this.parse(ExportCommand);
       let exportConfig = await setupExportConfig(flags);
@@ -117,8 +117,7 @@ export default class ExportCommand extends Command {
       log({ data: exportDir } as ExportConfig, `Failed to export stack content - ${formatError(error)}`, 'error');
       log(
         { data: exportDir } as ExportConfig,
-        `The log has been stored at ${
-          exportDir ? path.join(exportDir, 'logs', 'export') : path.join(__dirname, 'logs')
+        `The log has been stored at ${exportDir
         }`,
         'info',
       );
diff --git a/packages/contentstack-export/src/utils/logger.ts b/packages/contentstack-export/src/utils/logger.ts
index c3edf2ce27..b2b8302622 100644
--- a/packages/contentstack-export/src/utils/logger.ts
+++ b/packages/contentstack-export/src/utils/logger.ts
@@ -134,7 +134,7 @@ function init(_logPath: string) {
 }
 
 export const log = async (config: ExportConfig, message: any, type: string) => {
-  const logsPath = config.data || __dirname;
+  const logsPath = config.data;
   // ignoring the type argument, as we are not using it to create a logfile anymore
   if (type !== 'error') {
     // removed type argument from init method

From 2fc95e664fd5f0e50387367a01cb95d2072c076f Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Wed, 7 Feb 2024 12:54:53 +0530
Subject: [PATCH 05/12] changed the logs location to present working directory

---
 packages/contentstack-export/src/commands/cm/stacks/export.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
index 86b0f0ebf3..eee96bb61d 100644
--- a/packages/contentstack-export/src/commands/cm/stacks/export.ts
+++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -98,7 +98,7 @@ export default class ExportCommand extends Command {
   static aliases: string[] = ['cm:export'];
 
   async run(): Promise<void> {
-    let exportDir: string = path.join(__dirname, 'logs');
+    let exportDir: string = path.join(process.cwd(), 'logs');
     try {
       const { flags } = await this.parse(ExportCommand);
       let exportConfig = await setupExportConfig(flags);

From 8809cffe6ccc86d352d659122932c7caaffb8651 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Wed, 7 Feb 2024 13:10:54 +0530
Subject: [PATCH 06/12] indentation

---
 .../contentstack-export/src/commands/cm/stacks/export.ts   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
index eee96bb61d..620dc4c730 100644
--- a/packages/contentstack-export/src/commands/cm/stacks/export.ts
+++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -115,12 +115,7 @@ export default class ExportCommand extends Command {
       log(exportConfig, `The log has been stored at '${path.join(exportDir, 'logs', 'export')}'`, 'success');
     } catch (error) {
       log({ data: exportDir } as ExportConfig, `Failed to export stack content - ${formatError(error)}`, 'error');
-      log(
-        { data: exportDir } as ExportConfig,
-        `The log has been stored at ${exportDir
-        }`,
-        'info',
-      );
+      log({ data: exportDir } as ExportConfig, `The log has been stored at ${exportDir}`, 'info');
     }
   }
 }

From 866ede2ff3043da8bbfd5c47a1b73436e1bb3b90 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Wed, 7 Feb 2024 13:41:00 +0530
Subject: [PATCH 07/12] utilites version bump

---
 package-lock.json                             | 34 +++++++++----------
 packages/contentstack-audit/package.json      |  2 +-
 packages/contentstack-auth/package.json       |  2 +-
 packages/contentstack-bootstrap/package.json  |  2 +-
 packages/contentstack-branches/package.json   |  2 +-
 .../contentstack-bulk-publish/package.json    |  2 +-
 packages/contentstack-clone/package.json      |  2 +-
 packages/contentstack-command/package.json    |  2 +-
 packages/contentstack-config/package.json     |  2 +-
 .../contentstack-export-to-csv/package.json   |  2 +-
 packages/contentstack-export/package.json     |  2 +-
 packages/contentstack-import/package.json     |  2 +-
 packages/contentstack-launch/package.json     |  2 +-
 .../contentstack-migrate-rte/package.json     |  2 +-
 packages/contentstack-migration/package.json  |  2 +-
 packages/contentstack-seed/package.json       |  2 +-
 packages/contentstack-utilities/package.json  |  2 +-
 packages/contentstack/package.json            |  2 +-
 pnpm-lock.yaml                                | 32 ++++++++---------
 19 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c56942480..289a6c70d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23558,7 +23558,7 @@
         "@contentstack/cli-config": "~1.6.1",
         "@contentstack/cli-launch": "~1.0.16",
         "@contentstack/cli-migration": "~1.4.2",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@contentstack/management": "~1.13.0",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5",
@@ -23612,7 +23612,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@oclif/plugin-help": "^5",
         "@oclif/plugin-plugins": "^4.1.9",
         "chalk": "^4.1.2",
@@ -23874,7 +23874,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "chalk": "^4.0.0",
         "debug": "^4.1.1",
         "inquirer": "8.2.4",
@@ -23922,7 +23922,7 @@
       "dependencies": {
         "@contentstack/cli-cm-seed": "~1.7.0",
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "inquirer": "8.2.4",
         "mkdirp": "^1.0.4",
         "tar": "^6.1.13"
@@ -24006,7 +24006,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@oclif/core": "^2.9.3",
         "async": "^3.2.4",
         "big-json": "^3.2.0",
@@ -24055,7 +24055,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "bluebird": "^3.7.2",
         "chalk": "^4.1.2",
         "dotenv": "^16.1.4",
@@ -24095,7 +24095,7 @@
         "@contentstack/cli-cm-export": "~1.10.5",
         "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "async": "^3.2.4",
         "chalk": "^4.1.0",
         "child_process": "^1.0.2",
@@ -24143,7 +24143,7 @@
       "version": "1.2.17",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "contentstack": "^3.10.1"
       },
       "devDependencies": {
@@ -24224,7 +24224,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "chalk": "^4.0.0",
         "debug": "^4.1.1",
         "inquirer": "8.2.4",
@@ -24529,7 +24529,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@oclif/core": "^2.9.3",
         "async": "^3.2.4",
         "big-json": "^3.2.0",
@@ -24579,7 +24579,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "chalk": "^4.1.0",
         "fast-csv": "^4.3.6",
         "inquirer": "8.2.4",
@@ -24998,7 +24998,7 @@
       "dependencies": {
         "@contentstack/cli-audit": "^1.3.5",
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@contentstack/management": "~1.13.0",
         "@oclif/core": "^2.9.3",
         "big-json": "^3.2.0",
@@ -25128,7 +25128,7 @@
       "dependencies": {
         "@apollo/client": "^3.7.9",
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5",
         "@oclif/plugin-plugins": "^4.1.9",
@@ -25401,7 +25401,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "@contentstack/json-rte-serializer": "~2.0.4",
         "chalk": "^4.1.2",
         "collapse-whitespace": "^1.1.7",
@@ -25440,7 +25440,7 @@
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "async": "^3.2.4",
         "callsites": "^3.1.0",
         "cardinal": "^2.1.1",
@@ -25474,7 +25474,7 @@
       "dependencies": {
         "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
-        "@contentstack/cli-utilities": "~1.5.11",
+        "@contentstack/cli-utilities": "~1.5.12",
         "inquirer": "8.2.4",
         "mkdirp": "^1.0.4",
         "tar": "^6.1.13",
@@ -25556,7 +25556,7 @@
     },
     "packages/contentstack-utilities": {
       "name": "@contentstack/cli-utilities",
-      "version": "1.5.11",
+      "version": "1.5.12",
       "license": "MIT",
       "dependencies": {
         "@contentstack/management": "~1.13.0",
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
index 45c759d203..9bf9209cb9 100644
--- a/packages/contentstack-audit/package.json
+++ b/packages/contentstack-audit/package.json
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^4.1.9",
     "chalk": "^4.1.2",
diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
index ef501312bd..448f3a0c16 100644
--- a/packages/contentstack-auth/package.json
+++ b/packages/contentstack-auth/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
index 526c3517b2..361f341577 100644
--- a/packages/contentstack-bootstrap/package.json
+++ b/packages/contentstack-bootstrap/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@contentstack/cli-cm-seed": "~1.7.0",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
index 87de095bab..131f3fb134 100644
--- a/packages/contentstack-branches/package.json
+++ b/packages/contentstack-branches/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json
index cf241ebbe6..2cfda05977 100644
--- a/packages/contentstack-bulk-publish/package.json
+++ b/packages/contentstack-bulk-publish/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "dotenv": "^16.1.4",
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
index fcbd24afa4..43aa7a03b6 100644
--- a/packages/contentstack-clone/package.json
+++ b/packages/contentstack-clone/package.json
@@ -8,7 +8,7 @@
     "@contentstack/cli-cm-export": "~1.10.5",
     "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@colors/colors": "^1.5.0",
     "async": "^3.2.4",
     "chalk": "^4.1.0",
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
index a63adfb739..91cda88e62 100644
--- a/packages/contentstack-command/package.json
+++ b/packages/contentstack-command/package.json
@@ -17,7 +17,7 @@
     "format": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "contentstack": "^3.10.1"
   },
   "devDependencies": {
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
index 17ce590482..cd4309ad39 100644
--- a/packages/contentstack-config/package.json
+++ b/packages/contentstack-config/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
index c9c6430837..86bde2c529 100644
--- a/packages/contentstack-export-to-csv/package.json
+++ b/packages/contentstack-export-to-csv/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "chalk": "^4.1.0",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
index a2bde1bc8a..e70f726b5a 100644
--- a/packages/contentstack-export/package.json
+++ b/packages/contentstack-export/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
index 66120d55d8..1ce0d21d54 100644
--- a/packages/contentstack-import/package.json
+++ b/packages/contentstack-import/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-audit": "^1.3.5",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@contentstack/management": "~1.13.0",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",
diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json
index f2f7e35f20..1704922306 100755
--- a/packages/contentstack-launch/package.json
+++ b/packages/contentstack-launch/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@apollo/client": "^3.7.9",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@oclif/core": "^2.9.3",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^4.1.9",
diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json
index 4be2853e31..43f16ef3f6 100644
--- a/packages/contentstack-migrate-rte/package.json
+++ b/packages/contentstack-migrate-rte/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@contentstack/json-rte-serializer": "~2.0.4",
     "collapse-whitespace": "^1.1.7",
     "chalk": "^4.1.2",
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
index 1971b87df1..3f56e8e0a6 100644
--- a/packages/contentstack-migration/package.json
+++ b/packages/contentstack-migration/package.json
@@ -5,7 +5,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "async": "^3.2.4",
     "callsites": "^3.1.0",
     "cardinal": "^2.1.1",
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
index c279ba12ca..22a7c5808e 100644
--- a/packages/contentstack-seed/package.json
+++ b/packages/contentstack-seed/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13",
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
index 379f17ee27..5b5659b796 100644
--- a/packages/contentstack-utilities/package.json
+++ b/packages/contentstack-utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
index e03f890df0..7de2026b91 100755
--- a/packages/contentstack/package.json
+++ b/packages/contentstack/package.json
@@ -37,7 +37,7 @@
     "@contentstack/cli-config": "~1.6.1",
     "@contentstack/cli-launch": "~1.0.16",
     "@contentstack/cli-migration": "~1.4.2",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@contentstack/cli-utilities": "~1.5.12",
     "@contentstack/management": "~1.13.0",
     "@oclif/core": "^2.9.3",
     "@oclif/plugin-help": "^5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cfbeac1257..ea50029dec 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,7 +25,7 @@ importers:
       '@contentstack/cli-config': ~1.6.1
       '@contentstack/cli-launch': ~1.0.16
       '@contentstack/cli-migration': ~1.4.2
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@contentstack/management': ~1.13.0
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5
@@ -123,7 +123,7 @@ importers:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-dev-dependencies': ^1.2.4
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/plugin-help': ^5
       '@oclif/plugin-plugins': ^4.1.9
       '@oclif/test': ^2.5.6
@@ -187,7 +187,7 @@ importers:
   packages/contentstack-auth:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@fancy-test/nock': ^0.1.1
       '@oclif/plugin-help': ^5.1.19
       '@oclif/test': ^2.5.6
@@ -251,7 +251,7 @@ importers:
     specifiers:
       '@contentstack/cli-cm-seed': ~1.7.0
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       '@types/inquirer': ^9.0.3
       '@types/mkdirp': ^1.0.1
@@ -304,7 +304,7 @@ importers:
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-config': ~1.6.1
       '@contentstack/cli-dev-dependencies': ~1.2.4
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5.1.19
       '@oclif/test': ^2.5.6
@@ -380,7 +380,7 @@ importers:
   packages/contentstack-bulk-publish:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       bluebird: ^3.7.2
       chai: ^4.2.0
@@ -426,7 +426,7 @@ importers:
       '@contentstack/cli-cm-export': ~1.10.5
       '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       async: ^3.2.4
       chai: ^4.2.0
@@ -479,7 +479,7 @@ importers:
 
   packages/contentstack-command:
     specifiers:
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       '@types/chai': ^4.2.18
       '@types/mkdirp': ^1.0.1
@@ -521,7 +521,7 @@ importers:
   packages/contentstack-config:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       '@types/chai': ^4.2.18
       '@types/inquirer': ^9.0.3
@@ -610,7 +610,7 @@ importers:
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-config': ~1.6.1
       '@contentstack/cli-dev-dependencies': ~1.2.4
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5.1.19
       '@oclif/test': ^2.5.6
@@ -688,7 +688,7 @@ importers:
   packages/contentstack-export-to-csv:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       '@types/chai': ^4.3.6
       '@types/mocha': ^10.0.1
@@ -732,7 +732,7 @@ importers:
     specifiers:
       '@contentstack/cli-audit': ^1.3.5
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@contentstack/management': ~1.13.0
       '@oclif/core': ^2.9.3
       '@oclif/test': ^2.5.6
@@ -821,7 +821,7 @@ importers:
     specifiers:
       '@apollo/client': ^3.7.9
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5
       '@oclif/plugin-plugins': ^4.1.9
@@ -897,7 +897,7 @@ importers:
   packages/contentstack-migrate-rte:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@contentstack/json-rte-serializer': ~2.0.4
       '@oclif/test': ^2.5.6
       chai: ^4.3.4
@@ -944,7 +944,7 @@ importers:
   packages/contentstack-migration:
     specifiers:
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/test': ^2.5.6
       async: ^3.2.4
       callsites: ^3.1.0
@@ -992,7 +992,7 @@ importers:
     specifiers:
       '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
-      '@contentstack/cli-utilities': ~1.5.11
+      '@contentstack/cli-utilities': ~1.5.12
       '@oclif/plugin-help': ^5.1.19
       '@types/inquirer': ^9.0.3
       '@types/jest': ^26.0.15

From ff1d2860c00b86d0d7bf6e5eb16491694d7590f1 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Thu, 8 Feb 2024 12:32:15 +0530
Subject: [PATCH 08/12] Feat: Audit and check if extensions/marketplace apps
 are missing used in the content types and entries

---
 package-lock.json                             |  14 +-
 packages/contentstack-audit/README.md         |  10 +-
 packages/contentstack-audit/package.json      |   2 +-
 .../contentstack-audit/src/config/index.ts    |  20 ++-
 .../src/modules/content-types.ts              | 142 +++++++++++++--
 .../contentstack-audit/src/modules/entries.ts | 170 +++++++++++++++++-
 .../contentstack-audit/src/types/common.ts    |   6 +-
 .../src/types/content-types.ts                |  29 +--
 .../contentstack-audit/src/types/entries.ts   |  18 +-
 .../contentstack-audit/src/types/extension.ts |  48 +++++
 packages/contentstack-clone/package.json      |   2 +-
 packages/contentstack-import/README.md        |   2 +-
 packages/contentstack-import/package.json     |   4 +-
 packages/contentstack-seed/package.json       |   2 +-
 packages/contentstack/package.json            |   4 +-
 pnpm-lock.yaml                                |  10 +-
 16 files changed, 421 insertions(+), 62 deletions(-)
 create mode 100644 packages/contentstack-audit/src/types/extension.ts

diff --git a/package-lock.json b/package-lock.json
index eba3009fcb..bab8732ef2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23543,7 +23543,7 @@
       "version": "1.14.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-audit": "~1.3.5",
+        "@contentstack/cli-audit": "~1.4.0",
         "@contentstack/cli-auth": "~1.3.17",
         "@contentstack/cli-cm-bootstrap": "~1.8.0",
         "@contentstack/cli-cm-branches": "~1.0.22",
@@ -23551,7 +23551,7 @@
         "@contentstack/cli-cm-clone": "~1.10.0",
         "@contentstack/cli-cm-export": "~1.10.5",
         "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-cm-migrate-rte": "~1.4.15",
         "@contentstack/cli-cm-seed": "~1.7.1",
         "@contentstack/cli-command": "~1.2.17",
@@ -23608,7 +23608,7 @@
     },
     "packages/contentstack-audit": {
       "name": "@contentstack/cli-audit",
-      "version": "1.3.5",
+      "version": "1.4.0",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
@@ -24093,7 +24093,7 @@
       "dependencies": {
         "@colors/colors": "^1.5.0",
         "@contentstack/cli-cm-export": "~1.10.4",
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "async": "^3.2.4",
@@ -24993,10 +24993,10 @@
     },
     "packages/contentstack-import": {
       "name": "@contentstack/cli-cm-import",
-      "version": "1.13.3",
+      "version": "1.13.4",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-audit": "^1.3.5",
+        "@contentstack/cli-audit": "~1.4.0",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "@contentstack/management": "~1.13.0",
@@ -25472,7 +25472,7 @@
       "version": "1.7.1",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "inquirer": "8.2.4",
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
index 5af1961475..53417e0f57 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.3.5 darwin-arm64 node-v20.8.0
+@contentstack/cli-audit/1.4.0 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -99,14 +99,14 @@ Perform audits and fix possible errors in the exported Contentstack data.
 USAGE
   $ csdx audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
     content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--fix-only
-    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    reference|global_field|json:rte|json:extension|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
     <value>] [--csv | --no-truncate]
 
 FLAGS
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
   --fix-only=<option>...  Provide the list of fix options
-                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
+                          <options: reference|global_field|json:rte|json:extension|blocks|group>
   --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
   --report-path=<value>   Path to store the audit reports
@@ -198,14 +198,14 @@ Perform audits and fix possible errors in the exported Contentstack data.
 USAGE
   $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
     content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--fix-only
-    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    reference|global_field|json:rte|json:extension|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
     <value>] [--csv | --no-truncate]
 
 FLAGS
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
   --fix-only=<option>...  Provide the list of fix options
-                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
+                          <options: reference|global_field|json:rte|json:extension|blocks|group>
   --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
   --report-path=<value>   Path to store the audit reports
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
index 45c759d203..81bf7cf0ee 100644
--- a/packages/contentstack-audit/package.json
+++ b/packages/contentstack-audit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
diff --git a/packages/contentstack-audit/src/config/index.ts b/packages/contentstack-audit/src/config/index.ts
index 7a5a773273..e5f2eea755 100644
--- a/packages/contentstack-audit/src/config/index.ts
+++ b/packages/contentstack-audit/src/config/index.ts
@@ -3,7 +3,7 @@ const config = {
   skipRefs: ['sys_assets'],
   skipFieldTypes: ['taxonomy'],
   modules: ['content-types', 'global-fields', 'entries'],
-  'fix-fields': ['reference', 'global_field', 'json:rte', 'json:custom-field', 'blocks', 'group'],
+  'fix-fields': ['reference', 'global_field', 'json:rte', 'json:extension', 'blocks', 'group'],
   moduleConfig: {
     'content-types': {
       name: 'content type',
@@ -26,6 +26,24 @@ const config = {
       fileName: 'locales.json',
     },
   },
+  entries: {
+    systemKeys: [
+      'uid',
+      'ACL',
+      'tags',
+      'locale',
+      '_version',
+      '_metadata',
+      'published',
+      'created_at',
+      'updated_at',
+      'created_by',
+      'updated_by',
+      '_in_progress',
+      '_restore_status',
+      'publish_details',
+    ],
+  },
 };
 
 export default config;
diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
index c40500fc63..28b7d0b107 100644
--- a/packages/contentstack-audit/src/modules/content-types.ts
+++ b/packages/contentstack-audit/src/modules/content-types.ts
@@ -1,7 +1,9 @@
+import map from 'lodash/map';
 import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
-import { existsSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+
 import { ux } from '@contentstack/cli-utilities';
 
 import {
@@ -19,9 +21,11 @@ import {
   ReferenceFieldDataType,
   ContentTypeSchemaType,
   GlobalFieldSchemaTypes,
+  ExtensionOrAppFieldDataType,
 } from '../types';
 import auditConfig from '../config';
 import { $t, auditFixMsg, auditMsg, commonMsg } from '../messages';
+import { MarketplaceAppsInstallationData } from '../types/extension';
 
 /* The `ContentType` class is responsible for scanning content types, looking for references, and
 generating a report in JSON and CSV formats. */
@@ -33,6 +37,7 @@ export default class ContentType {
   public folderPath: string;
   public currentUid!: string;
   public currentTitle!: string;
+  public extensions: string[] = [];
   public inMemoryFix: boolean = false;
   public gfSchema: ContentTypeStruct[];
   public ctSchema: ContentTypeStruct[];
@@ -67,6 +72,8 @@ export default class ContentType {
 
     this.schema = this.moduleName === 'content-types' ? this.ctSchema : this.gfSchema;
 
+    await this.prerequisiteData();
+
     for (const schema of this.schema ?? []) {
       this.currentUid = schema.uid;
       this.currentTitle = schema.title;
@@ -96,6 +103,35 @@ export default class ContentType {
     return this.missingRefs;
   }
 
+  /**
+   * @method prerequisiteData
+   * The `prerequisiteData` function reads and parses JSON files to retrieve extension and marketplace
+   * app data, and stores them in the `extensions` array.
+   */
+  async prerequisiteData() {
+    const extensionPath = resolve(this.config.basePath, 'extensions', 'extensions.json');
+    const marketplacePath = resolve(this.config.basePath, 'marketplace_apps', 'marketplace_apps.json');
+
+    if (existsSync(extensionPath)) {
+      try {
+        this.extensions = Object.keys(JSON.parse(readFileSync(extensionPath, 'utf8')));
+      } catch (error) {}
+    }
+
+    if (existsSync(marketplacePath)) {
+      try {
+        const marketplaceApps: MarketplaceAppsInstallationData[] = JSON.parse(readFileSync(marketplacePath, 'utf8'));
+
+        for (const app of marketplaceApps) {
+          const metaData = map(map(app?.ui_location?.locations, 'meta').flat(), 'extension_uid').filter(
+            (val) => val,
+          ) as string[];
+          this.extensions.push(...metaData);
+        }
+      } catch (error) {}
+    }
+  }
+
   /**
    * The function checks if it can write the fix content to a file and if so, it writes the content as
    * JSON to the specified file path.
@@ -157,10 +193,16 @@ export default class ContentType {
           );
           break;
         case 'json':
-          if (child.field_metadata.extension) {
-            if (!fixTypes.includes('json:custom-field')) continue;
+          if ('extension' in child.field_metadata && child.field_metadata.extension) {
+            if (!fixTypes.includes('json:extension')) continue;
             // NOTE Custom field type
-          } else if (child.field_metadata.allow_json_rte) {
+            this.missingRefs[this.currentUid].push(
+              ...this.validateExtensionAndAppField(
+                [...tree, { uid: child.uid, name: child.display_name }],
+                child as ExtensionOrAppFieldDataType,
+              ),
+            );
+          } else if ('allow_json_rte' in child.field_metadata && child.field_metadata.allow_json_rte) {
             if (!fixTypes.includes('json:rte')) continue;
             // NOTE JSON RTE field type
             this.missingRefs[this.currentUid].push(
@@ -199,6 +241,45 @@ export default class ContentType {
     return this.validateReferenceToValues(tree, field);
   }
 
+  /**
+   * The function `validateExtensionAndAppsField` checks if a given field has a valid extension or app
+   * reference and returns any missing references.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} field - The `field` parameter is of type `ExtensionOrAppFieldDataType`.
+   * @returns The function `validateExtensionAndAppsField` returns an array of `RefErrorReturnType`
+   * objects.
+   */
+  validateExtensionAndAppField(
+    tree: Record<string, unknown>[],
+    field: ExtensionOrAppFieldDataType,
+  ): RefErrorReturnType[] {
+    if (this.fix) return [];
+
+    const missingRefs = [];
+    let { uid, extension_uid, display_name, data_type } = field;
+
+    if (!this.extensions.includes(extension_uid)) {
+      missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+    }
+
+    return missingRefs.length
+      ? [
+          {
+            tree,
+            data_type,
+            missingRefs,
+            display_name,
+            ct_uid: this.currentUid,
+            name: this.currentTitle,
+            treeStr: tree
+              .map(({ name }) => name)
+              .filter((val) => val)
+              .join(' ➜ '),
+          },
+        ]
+      : [];
+  }
+
   /**
    * The function "validateGlobalField" asynchronously validates a global field by looking for a
    * reference in a tree data structure.
@@ -298,7 +379,9 @@ export default class ContentType {
 
     for (const reference of reference_to ?? []) {
       // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
-      if (this.config.skipRefs.includes(reference)) continue;
+      if (this.config.skipRefs.includes(reference)) {
+        continue;
+      }
 
       const refExist = find(this.ctSchema, { uid: reference });
 
@@ -350,14 +433,13 @@ export default class ContentType {
           case 'json':
           case 'reference':
             if (data_type === 'json') {
-              if (field.field_metadata.extension) {
+              if ('extension' in field.field_metadata && field.field_metadata.extension) {
                 // NOTE Custom field type
-                if (!fixTypes.includes('json:custom-field')) return field;
+                if (!fixTypes.includes('json:extension')) return field;
 
                 // NOTE Fix logic
-
-                return field;
-              } else if (field.field_metadata.allow_json_rte) {
+                return this.fixMissingExtensionOrApp(tree, field as ExtensionOrAppFieldDataType);
+              } else if ('allow_json_rte' in field.field_metadata && field.field_metadata.allow_json_rte) {
                 if (!fixTypes.includes('json:rte')) return field;
 
                 return this.fixMissingReferences(tree, field as JsonRTEFieldDataType);
@@ -499,6 +581,41 @@ export default class ContentType {
       .filter((val) => val) as ModularBlockType[];
   }
 
+  /**
+   * The function checks for missing extension or app references in a given tree and fixes them if the
+   * fix flag is enabled.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} field - The `field` parameter is of type
+   * `ExtensionOrAppFieldDataType`.
+   * @returns If the `fix` flag is true and there are missing references (`missingRefs` is not empty),
+   * then `null` is returned. Otherwise, the `field` parameter is returned.
+   */
+  fixMissingExtensionOrApp(tree: Record<string, unknown>[], field: ExtensionOrAppFieldDataType) {
+    const missingRefs: string[] = [];
+    const { uid, extension_uid, data_type, display_name } = field;
+
+    if (!this.extensions.includes(extension_uid)) {
+      missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+    }
+
+    if (this.fix && !isEmpty(missingRefs)) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        data_type,
+        missingRefs,
+        display_name,
+        fixStatus: 'Fixed',
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+
+      return null
+    }
+
+    return field;
+  }
+
   /**
    * The function `fixMissingReferences` checks for missing references in a given tree and field, and
    * attempts to fix them by removing the missing references from the field's `reference_to` array.
@@ -515,7 +632,9 @@ export default class ContentType {
 
     for (const reference of reference_to ?? []) {
       // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
-      if (this.config.skipRefs.includes(reference)) continue;
+      if (this.config.skipRefs.includes(reference)) {
+        continue;
+      }
 
       const refExist = find(this.ctSchema, { uid: reference });
 
@@ -557,6 +676,7 @@ export default class ContentType {
    */
   fixGroupField(tree: Record<string, unknown>[], field: GroupFieldDataType) {
     const { data_type, display_name } = field;
+
     field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
 
     if (isEmpty(field.schema)) {
diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
index 56f5ff884f..96cae08247 100644
--- a/packages/contentstack-audit/src/modules/entries.ts
+++ b/packages/contentstack-audit/src/modules/entries.ts
@@ -1,3 +1,4 @@
+import map from 'lodash/map';
 import find from 'lodash/find';
 import values from 'lodash/values';
 import isEmpty from 'lodash/isEmpty';
@@ -31,8 +32,11 @@ import {
   EntryJsonRTEFieldDataType,
   EntryModularBlocksDataType,
   EntryReferenceFieldDataType,
+  ExtensionOrAppFieldDataType,
+  EntryExtensionOrAppFieldDataType,
 } from '../types';
 import GlobalField from './global-fields';
+import { MarketplaceAppsInstallationData } from '../types/extension';
 
 export default class Entries {
   public log: LogFn;
@@ -43,6 +47,7 @@ export default class Entries {
   public folderPath: string;
   public currentUid!: string;
   public currentTitle!: string;
+  public extensions: string[] = [];
   public gfSchema: ContentTypeStruct[];
   public ctSchema: ContentTypeStruct[];
   protected entries!: Record<string, EntryStruct>;
@@ -96,6 +101,10 @@ export default class Entries {
               this.missingRefs[this.currentUid] = [];
             }
 
+            if (this.fix) {
+              this.removeMissingKeysOnEntry(ctSchema.schema as ContentTypeSchemaType[], this.entries[entryUid]);
+            }
+
             this.lookForReference([{ locale: code, uid, name: title }], ctSchema, this.entries[entryUid]);
             this.log(
               $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, {
@@ -152,6 +161,28 @@ export default class Entries {
       ctSchema: this.ctSchema,
       gfSchema: this.gfSchema,
     }).run(true)) as ContentTypeStruct[];
+
+    const extensionPath = resolve(this.config.basePath, 'extensions', 'extensions.json');
+    const marketplacePath = resolve(this.config.basePath, 'marketplace_apps', 'marketplace_apps.json');
+
+    if (existsSync(extensionPath)) {
+      try {
+        this.extensions = Object.keys(JSON.parse(readFileSync(extensionPath, 'utf8')));
+      } catch (error) {}
+    }
+
+    if (existsSync(marketplacePath)) {
+      try {
+        const marketplaceApps: MarketplaceAppsInstallationData[] = JSON.parse(readFileSync(marketplacePath, 'utf8'));
+
+        for (const app of marketplaceApps) {
+          const metaData = map(map(app?.ui_location?.locations, 'meta').flat(), 'extension_uid').filter(
+            (val) => val,
+          ) as string[];
+          this.extensions.push(...metaData);
+        }
+      } catch (error) {}
+    }
   }
 
   /**
@@ -216,9 +247,16 @@ export default class Entries {
           );
           break;
         case 'json':
-          if (child.field_metadata.extension) {
+          if ('extension' in child.field_metadata && child.field_metadata.extension) {
+            this.missingRefs[this.currentUid].push(
+              ...this.validateExtensionAndAppField(
+                [...tree, { uid: child.uid, name: child.display_name, field: uid }],
+                child as ExtensionOrAppFieldDataType,
+                entry as EntryExtensionOrAppFieldDataType,
+              ),
+            );
             // NOTE Custom field type
-          } else if (child.field_metadata.allow_json_rte) {
+          } else if ('allow_json_rte' in child.field_metadata && child.field_metadata.allow_json_rte) {
             // NOTE JSON RTE field type
             this.validateJsonRTEFields(
               [...tree, { uid: child.uid, name: child.display_name, field: uid }],
@@ -266,6 +304,56 @@ export default class Entries {
     return this.validateReferenceValues(tree, fieldStructure, field);
   }
 
+  /**
+   * The function `validateExtensionAndAppField` checks if a given field has a valid extension
+   * reference and returns any missing references.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} fieldStructure - The `fieldStructure` parameter is of type
+   * `ExtensionOrAppFieldDataType` and represents the structure of a field in an extension or app. It
+   * contains properties such as `uid`, `display_name`, and `data_type`.
+   * @param {EntryExtensionOrAppFieldDataType} field - The `field` parameter is of type
+   * `EntryExtensionOrAppFieldDataType`, which is an object containing information about a specific
+   * field in an entry. It has the following properties:
+   * @returns an array containing an object if there are missing references. If there are no missing
+   * references, an empty array is returned.
+   */
+  validateExtensionAndAppField(
+    tree: Record<string, unknown>[],
+    fieldStructure: ExtensionOrAppFieldDataType,
+    field: EntryExtensionOrAppFieldDataType,
+  ) {
+    if (this.fix) return [];
+
+    const missingRefs = [];
+
+    let { uid, display_name, data_type } = fieldStructure || {};
+
+    if (field[uid]) {
+      let { metadata: { extension_uid } = { extension_uid: '' } } = field[uid] || {};
+
+      if (!this.extensions.includes(extension_uid)) {
+        missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+      }
+    }
+
+    return missingRefs.length
+      ? [
+          {
+            tree,
+            data_type,
+            missingRefs,
+            display_name,
+            ct_uid: this.currentUid,
+            name: this.currentTitle,
+            treeStr: tree
+              .map(({ name }) => name)
+              .filter((val) => val)
+              .join(' ➜ '),
+          },
+        ]
+      : [];
+  }
+
   /**
    * The function "validateGlobalField" is an asynchronous function that takes in a tree,
    * fieldStructure, and field as parameters and looks for references in the tree.
@@ -438,6 +526,19 @@ export default class Entries {
       : [];
   }
 
+  removeMissingKeysOnEntry(schema: ContentTypeSchemaType[], entry: EntryFieldType) {
+    // NOTE remove invalid entry keys
+    const ctFields = map(schema, 'uid');
+    const entryFields = Object.keys(entry ?? {});
+
+    entryFields.forEach((eKey) => {
+      // NOTE Key should not be system key and not exist in schema means it's invalid entry key
+      if (!this.config.entries.systemKeys.includes(eKey) && !ctFields.includes(eKey)) {
+        delete entry[eKey];
+      }
+    });
+  }
+
   /**
    * The function `runFixOnSchema` takes in a tree, schema, and entry, and applies fixes to the entry
    * based on the schema.
@@ -472,10 +573,15 @@ export default class Entries {
         case 'json':
         case 'reference':
           if (data_type === 'json') {
-            if (field.field_metadata.extension) {
+            if ('extension' in field.field_metadata && field.field_metadata.extension) {
               // NOTE Custom field type
+              this.fixMissingExtensionOrApp(
+                [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+                field as ExtensionOrAppFieldDataType,
+                entry as EntryExtensionOrAppFieldDataType,
+              );
               break;
-            } else if (field.field_metadata.allow_json_rte) {
+            } else if ('allow_json_rte' in field.field_metadata && field.field_metadata.allow_json_rte) {
               this.fixJsonRteMissingReferences(
                 [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
                 field as JsonRTEFieldDataType,
@@ -509,7 +615,6 @@ export default class Entries {
           ) as EntryGroupFieldDataType;
           break;
       }
-    
     });
 
     return entry;
@@ -576,6 +681,54 @@ export default class Entries {
     return entry;
   }
 
+  /**
+   * The function `fixMissingExtensionOrApp` checks if a field in an entry has a valid extension or app
+   * reference, and fixes it if necessary.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} field - The `field` parameter is of type
+   * `ExtensionOrAppFieldDataType`, which is an object with properties `uid`, `display_name`, and
+   * `data_type`.
+   * @param {EntryExtensionOrAppFieldDataType} entry - The `entry` parameter is of type
+   * `EntryExtensionOrAppFieldDataType`, which is an object containing the data for a specific entry.
+   * It may have a property with the key specified by the `uid` variable, which represents the field
+   * that contains the extension or app data.
+   * @returns the `field` parameter.
+   */
+  fixMissingExtensionOrApp(
+    tree: Record<string, unknown>[],
+    field: ExtensionOrAppFieldDataType,
+    entry: EntryExtensionOrAppFieldDataType,
+  ) {
+    const missingRefs = [];
+
+    let { uid, display_name, data_type } = field || {};
+
+    if (entry[uid]) {
+      let { metadata: { extension_uid } = { extension_uid: '' } } = entry[uid] || {};
+
+      if (extension_uid && !this.extensions.includes(extension_uid)) {
+        missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+      }
+    }
+
+    if (this.fix && !isEmpty(missingRefs)) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        data_type,
+        missingRefs,
+        display_name,
+        fixStatus: 'Fixed',
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+
+      delete entry[uid];
+    }
+
+    return field;
+  }
+
   /**
    * The function `fixGroupField` takes in a tree, a field, and an entry, and if the field has a
    * schema, it runs a fix on the schema and returns the updated entry, otherwise it returns the
@@ -672,9 +825,9 @@ export default class Entries {
     field: ReferenceFieldDataType | JsonRTEFieldDataType,
     entry: EntryReferenceFieldDataType[],
   ) {
-
     const missingRefs: Record<string, any>[] = [];
-    entry = entry?.map((reference) => {
+    entry = entry
+      ?.map((reference) => {
         const { uid } = reference;
         const refExist = find(this.entryMetaData, { uid });
 
@@ -684,7 +837,8 @@ export default class Entries {
         }
 
         return reference;
-      }).filter((val) => val) as EntryReferenceFieldDataType[];
+      })
+      .filter((val) => val) as EntryReferenceFieldDataType[];
 
     if (!isEmpty(missingRefs)) {
       this.missingRefs[this.currentUid].push({
diff --git a/packages/contentstack-audit/src/types/common.ts b/packages/contentstack-audit/src/types/common.ts
index a0c04cfece..71d1ba844f 100644
--- a/packages/contentstack-audit/src/types/common.ts
+++ b/packages/contentstack-audit/src/types/common.ts
@@ -5,4 +5,8 @@ type IncludeFlags<T, K extends keyof T> = Pick<T, K>;
 
 type CommandNames = 'cm:stacks:audit' | 'cm:stacks:audit:fix';
 
-export { IFlags, IncludeFlags, CommandNames };
+interface AnyProperty {
+  [propName: string]: any;
+}
+
+export { IFlags, IncludeFlags, CommandNames, AnyProperty };
diff --git a/packages/contentstack-audit/src/types/content-types.ts b/packages/contentstack-audit/src/types/content-types.ts
index 95b4aff074..ebd8f32ac8 100644
--- a/packages/contentstack-audit/src/types/content-types.ts
+++ b/packages/contentstack-audit/src/types/content-types.ts
@@ -1,10 +1,11 @@
 import config from '../config';
+import { AnyProperty } from './common';
 import { ConfigType, LogFn } from './utils';
 
 type ContentTypeSchemaType =
   | ReferenceFieldDataType
   | GlobalFieldDataType
-  | CustomFieldDataType
+  | ExtensionOrAppFieldDataType
   | JsonRTEFieldDataType
   | GroupFieldDataType
   | ModularBlocksDataType;
@@ -18,7 +19,7 @@ type ContentTypeStruct = {
 
 type ModuleConstructorParam = {
   log: LogFn;
-  fix?: boolean
+  fix?: boolean;
   config: ConfigType;
   moduleName?: keyof typeof config.moduleConfig;
 };
@@ -33,10 +34,9 @@ type CommonDataTypeStruct = {
   data_type: string;
   display_name: string;
   field_metadata: {
-    extension: boolean;
     ref_multiple: boolean;
     allow_json_rte: boolean;
-  } & Record<string, unknown>;
+  } & AnyProperty;
 };
 
 type RefErrorReturnType = {
@@ -44,7 +44,7 @@ type RefErrorReturnType = {
   ct_uid: string;
   treeStr: string;
   data_type: string;
-  fixStatus?: string
+  fixStatus?: string;
   missingRefs: string[];
   display_name: string;
   tree: Record<string, unknown>[];
@@ -62,9 +62,9 @@ type GlobalFieldDataType = CommonDataTypeStruct & {
 };
 
 // NOTE Type 3
-type CustomFieldDataType = CommonDataTypeStruct & {
-  reference_to: string[];
+type ExtensionOrAppFieldDataType = Omit<CommonDataTypeStruct, 'field_metadata'> & {
   extension_uid: string;
+  field_metadata: { extension: boolean };
 };
 
 // NOTE Type 4
@@ -86,7 +86,7 @@ type ModularBlockType = {
     | JsonRTEFieldDataType
     | ModularBlocksDataType
     | ReferenceFieldDataType
-    | CustomFieldDataType
+    | ExtensionOrAppFieldDataType
     | GroupFieldDataType
   )[];
 };
@@ -96,9 +96,14 @@ type ModularBlocksDataType = CommonDataTypeStruct & {
 };
 
 // NOTE It can have following field types global, Custom, json/json rte, reference
-type GroupFieldSchemaTypes = GroupFieldDataType | CommonDataTypeStruct | GlobalFieldDataType | ReferenceFieldDataType;
+type GroupFieldSchemaTypes =
+  | GroupFieldDataType
+  | CommonDataTypeStruct
+  | GlobalFieldDataType
+  | ReferenceFieldDataType
+  | ExtensionOrAppFieldDataType;
 
-type GlobalFieldSchemaTypes = ReferenceFieldDataType | GroupFieldDataType | CustomFieldDataType;
+type GlobalFieldSchemaTypes = ReferenceFieldDataType | GroupFieldDataType | ExtensionOrAppFieldDataType;
 
 type ModularBlocksSchemaTypes = ReferenceFieldDataType | JsonRTEFieldDataType;
 
@@ -107,7 +112,7 @@ enum OutputColumn {
   'Field name' = 'display_name',
   'Field type' = 'data_type',
   'Missing references' = 'missingRefs',
-  Path = 'treeStr'
+  Path = 'treeStr',
 }
 
 export {
@@ -116,7 +121,7 @@ export {
   ModuleConstructorParam,
   ReferenceFieldDataType,
   GlobalFieldDataType,
-  CustomFieldDataType,
+  ExtensionOrAppFieldDataType,
   JsonRTEFieldDataType,
   GroupFieldDataType,
   ModularBlocksDataType,
diff --git a/packages/contentstack-audit/src/types/entries.ts b/packages/contentstack-audit/src/types/entries.ts
index 7e3f7010a5..d91b4b94b5 100644
--- a/packages/contentstack-audit/src/types/entries.ts
+++ b/packages/contentstack-audit/src/types/entries.ts
@@ -1,3 +1,5 @@
+import { AnyProperty } from './common';
+
 type Locale = {
   uid: string;
   code: string;
@@ -29,8 +31,11 @@ type EntryGlobalFieldDataType = {
 };
 
 // NOTE Type 3
-type EntryCustomFieldDataType = {
-  [key: string]: EntryStruct;
+type EntryExtensionOrAppFieldDataType = {
+  [key: string]: {
+    uid: string;
+    metadata: { extension_uid: string } & AnyProperty;
+  };
 };
 
 // NOTE Type 4
@@ -71,14 +76,19 @@ type EntryRefErrorReturnType = {
   missingRefs: string[] | Record<string, unknown>[];
 };
 
-type EntryFieldType = EntryStruct | EntryGlobalFieldDataType | EntryModularBlocksDataType | EntryGroupFieldDataType;
+type EntryFieldType =
+  | EntryStruct
+  | EntryGlobalFieldDataType
+  | EntryModularBlocksDataType
+  | EntryGroupFieldDataType
+  | EntryExtensionOrAppFieldDataType;
 
 export {
   Locale,
   EntryStruct,
   EntryFieldType,
   EntryGlobalFieldDataType,
-  EntryCustomFieldDataType,
+  EntryExtensionOrAppFieldDataType,
   EntryJsonRTEFieldDataType,
   EntryGroupFieldDataType,
   EntryModularBlocksDataType,
diff --git a/packages/contentstack-audit/src/types/extension.ts b/packages/contentstack-audit/src/types/extension.ts
new file mode 100644
index 0000000000..88705ef289
--- /dev/null
+++ b/packages/contentstack-audit/src/types/extension.ts
@@ -0,0 +1,48 @@
+type AppLocation =
+  | 'cs.cm.stack.config'
+  | 'cs.cm.stack.dashboard'
+  | 'cs.cm.stack.sidebar'
+  | 'cs.cm.stack.custom_field'
+  | 'cs.cm.stack.rte'
+  | 'cs.cm.stack.asset_sidebar'
+  | 'cs.org.config';
+
+interface ExtensionMeta {
+  uid?: string;
+  name?: string;
+  description?: string;
+  path?: string;
+  signed: boolean;
+  extension_uid?: string;
+  data_type?: string;
+  enabled?: boolean;
+  width?: number;
+  blur?: boolean;
+  default_width?: 'full' | 'half';
+}
+
+interface Extension {
+  type: AppLocation;
+  meta: ExtensionMeta[];
+}
+
+interface LocationConfiguration {
+  signed: boolean;
+  base_url: string;
+  locations: Extension[];
+}
+
+type MarketplaceAppsInstallationData = {
+  uid: string;
+  status: string;
+  configuration: any;
+  server_configuration: any;
+  target: { type: string; uid: string };
+  ui_location: LocationConfiguration;
+} & AnyProperty;
+
+interface AnyProperty {
+  [propName: string]: any;
+}
+
+export { MarketplaceAppsInstallationData };
\ No newline at end of file
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
index de90d23501..72b6d0560b 100644
--- a/packages/contentstack-clone/package.json
+++ b/packages/contentstack-clone/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@contentstack/cli-cm-export": "~1.10.4",
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "@colors/colors": "^1.5.0",
diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md
index ca6fe2c3ff..5daa5975aa 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.13.3 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-import/1.13.4 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
index dc5c4aa3cb..68bb88db64 100644
--- a/packages/contentstack-import/package.json
+++ b/packages/contentstack-import/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.13.3",
+  "version": "1.13.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "^1.3.5",
+    "@contentstack/cli-audit": "~1.4.0",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "@contentstack/management": "~1.13.0",
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
index 2322efead6..c279ba12ca 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.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
index 7fd21fa112..36bf221216 100755
--- a/packages/contentstack/package.json
+++ b/packages/contentstack/package.json
@@ -22,7 +22,7 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.3.5",
+    "@contentstack/cli-audit": "~1.4.0",
     "@contentstack/cli-auth": "~1.3.17",
     "@contentstack/cli-cm-bootstrap": "~1.8.0",
     "@contentstack/cli-cm-branches": "~1.0.22",
@@ -30,7 +30,7 @@
     "@contentstack/cli-cm-export": "~1.10.5",
     "@contentstack/cli-cm-clone": "~1.10.0",
     "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.1",
     "@contentstack/cli-command": "~1.2.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd5b947a76..5de3f4beab 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
 
   packages/contentstack:
     specifiers:
-      '@contentstack/cli-audit': ~1.3.5
+      '@contentstack/cli-audit': ~1.4.0
       '@contentstack/cli-auth': ~1.3.17
       '@contentstack/cli-cm-bootstrap': ~1.8.0
       '@contentstack/cli-cm-branches': ~1.0.22
@@ -18,7 +18,7 @@ importers:
       '@contentstack/cli-cm-clone': ~1.10.0
       '@contentstack/cli-cm-export': ~1.10.5
       '@contentstack/cli-cm-export-to-csv': ~1.6.2
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-cm-migrate-rte': ~1.4.15
       '@contentstack/cli-cm-seed': ~1.7.1
       '@contentstack/cli-command': ~1.2.17
@@ -424,7 +424,7 @@ importers:
     specifiers:
       '@colors/colors': ^1.5.0
       '@contentstack/cli-cm-export': ~1.10.4
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@oclif/test': ^2.5.6
@@ -730,7 +730,7 @@ importers:
 
   packages/contentstack-import:
     specifiers:
-      '@contentstack/cli-audit': ^1.3.5
+      '@contentstack/cli-audit': ~1.4.0
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@contentstack/management': ~1.13.0
@@ -990,7 +990,7 @@ importers:
 
   packages/contentstack-seed:
     specifiers:
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@oclif/plugin-help': ^5.1.19

From 030c576c21f66fa63939e45dfb5d1416c9ff6911 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Thu, 8 Feb 2024 13:38:07 +0530
Subject: [PATCH 09/12] Entry, missing extension logic fix

---
 packages/contentstack-audit/src/modules/entries.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
index 96cae08247..a54185af8c 100644
--- a/packages/contentstack-audit/src/modules/entries.ts
+++ b/packages/contentstack-audit/src/modules/entries.ts
@@ -331,7 +331,7 @@ export default class Entries {
     if (field[uid]) {
       let { metadata: { extension_uid } = { extension_uid: '' } } = field[uid] || {};
 
-      if (!this.extensions.includes(extension_uid)) {
+      if (extension_uid && !this.extensions.includes(extension_uid)) {
         missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
       }
     }

From f0254a84a2b2260cb662a65409ccf301b6b0e3d1 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Fri, 9 Feb 2024 15:09:10 +0530
Subject: [PATCH 10/12] fixed for NA region developerhub

---
 packages/contentstack-utilities/src/helpers.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts
index cacf0659f2..debee61879 100644
--- a/packages/contentstack-utilities/src/helpers.ts
+++ b/packages/contentstack-utilities/src/helpers.ts
@@ -26,8 +26,13 @@ export const isManagementTokenValid = async (stackAPIKey, managementToken) => {
   }
 }
 
-export const createDeveloperHubUrl = (developerHubBaseUrl:string) : string => {
-  developerHubBaseUrl = developerHubBaseUrl?.replace('api','developerhub-api');
-  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')?developerHubBaseUrl.replace('dev11','dev'):developerHubBaseUrl;
+export const createDeveloperHubUrl = (developerHubBaseUrl: string): string => {
+  developerHubBaseUrl = developerHubBaseUrl?.replace('api', 'developerhub-api');
+  developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')
+    ? developerHubBaseUrl.replace('dev11', 'dev')
+    : developerHubBaseUrl;
+  developerHubBaseUrl = developerHubBaseUrl.endsWith('io')
+    ? developerHubBaseUrl.replace('io', 'com')
+    : developerHubBaseUrl;
   return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
-}
\ No newline at end of file
+};

From c4f604ad7474baf67e5b6a73fc9e472644481648 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Fri, 9 Feb 2024 19:07:06 +0530
Subject: [PATCH 11/12] replaced cdn by appHost for generating the rest-preview
 urls

---
 .../contentstack-auth/test/integration/auth.test.ts  |  2 +-
 .../contentstack-auth/test/unit/auth-handler.test.ts |  6 +++---
 .../test/unit/commands/login.test.ts                 |  6 +++---
 .../test/unit/commands/logout.test.ts                |  2 +-
 .../test/unit/commands/whoami.test.ts                |  4 ++--
 .../contentstack-bootstrap/src/bootstrap/utils.ts    |  2 +-
 .../test/integration/init.test.js                    |  2 +-
 packages/contentstack-import/.env.sample             |  4 ++--
 .../test/integration/init.test.js                    |  2 +-
 .../test/dummy/entriesResponse.json                  | 12 ++++++------
 packages/contentstack-migration/README.md            |  2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/contentstack-auth/test/integration/auth.test.ts b/packages/contentstack-auth/test/integration/auth.test.ts
index 410f69636d..6404a19998 100644
--- a/packages/contentstack-auth/test/integration/auth.test.ts
+++ b/packages/contentstack-auth/test/integration/auth.test.ts
@@ -10,7 +10,7 @@ const messageFilePath = path.join(__dirname, '..', '..', '..', 'contentstack-uti
 const crypto = new NodeCrypto({
   typeIdentifier: '◈',
   algorithm: 'aes-192-cbc',
-  encryptionKey: process.env.ENCRYPTION_KEY || '***REMOVED***'
+  encryptionKey: process.env.ENCRYPTION_KEY || 'gjh67567mn'
 });
 const username = process.env.ENCRYPTION_KEY ? crypto.decrypt(process.env.USERNAME) : process.env.USERNAME
 const password = process.env.ENCRYPTION_KEY ? crypto.decrypt(process.env.PASSWORD) : process.env.PASSWORD
diff --git a/packages/contentstack-auth/test/unit/auth-handler.test.ts b/packages/contentstack-auth/test/unit/auth-handler.test.ts
index ead258f36f..72b30f0e68 100644
--- a/packages/contentstack-auth/test/unit/auth-handler.test.ts
+++ b/packages/contentstack-auth/test/unit/auth-handler.test.ts
@@ -4,9 +4,9 @@ import { authHandler, interactive } from '../../src/utils';
 import { CLIError, cliux } from '@contentstack/cli-utilities';
 import { User } from '../../src/interfaces';
 
-const user: User = { email: '***REMOVED***', authtoken: 'testtoken' };
-const credentials = { email: '***REMOVED***', password: 'testpassword' };
-const invalidCredentials = { email: '***REMOVED***', password: 'invalidpassword' };
+const user: User = { email: 'test@contentstack.com', authtoken: 'testtoken' };
+const credentials = { email: 'test@contentstack.com', password: 'testpassword' };
+const invalidCredentials = { email: 'test@contentstack.com', password: 'invalidpassword' };
 let TFAEnabled = false;
 let TFAChannel = 'authy';
 const TFATestToken = '24563992';
diff --git a/packages/contentstack-auth/test/unit/commands/login.test.ts b/packages/contentstack-auth/test/unit/commands/login.test.ts
index c91a4d106f..f89c83bd4f 100644
--- a/packages/contentstack-auth/test/unit/commands/login.test.ts
+++ b/packages/contentstack-auth/test/unit/commands/login.test.ts
@@ -6,9 +6,9 @@ import { configHandler, cliux } from '@contentstack/cli-utilities';
 
 const config = configHandler;
 
-const user = { email: '***REMOVED***', authtoken: 'testtoken' };
-const credentials = { email: '***REMOVED***', password: 'testpassword' };
-const invalidCredentials = { email: '***REMOVED***', password: 'invalidpassword' };
+const user = { email: 'test@contentstack.com', authtoken: 'testtoken' };
+const credentials = { email: 'test@contentstack.com', password: 'testpassword' };
+const invalidCredentials = { email: 'test@contentstack.com', password: 'invalidpassword' };
 const TFATestToken = '24563992';
 
 describe('Login Command', () => {
diff --git a/packages/contentstack-auth/test/unit/commands/logout.test.ts b/packages/contentstack-auth/test/unit/commands/logout.test.ts
index 6ccf39abed..0b16451c64 100644
--- a/packages/contentstack-auth/test/unit/commands/logout.test.ts
+++ b/packages/contentstack-auth/test/unit/commands/logout.test.ts
@@ -4,7 +4,7 @@ import LogoutCommand from '../../../src/commands/auth/logout';
 import { authHandler } from '../../../src/utils';
 import { CLIError, cliux } from '@contentstack/cli-utilities';
 
-const user = { email: '***REMOVED***', authtoken: 'testtoken' };
+const user = { email: 'test@contentstack.com', authtoken: 'testtoken' };
 const validAuthToken = 'bltadjkjdkjfd';
 
 describe('Logout Command', () => {
diff --git a/packages/contentstack-auth/test/unit/commands/whoami.test.ts b/packages/contentstack-auth/test/unit/commands/whoami.test.ts
index b259141a5e..f90b00b2b9 100644
--- a/packages/contentstack-auth/test/unit/commands/whoami.test.ts
+++ b/packages/contentstack-auth/test/unit/commands/whoami.test.ts
@@ -7,7 +7,7 @@ describe('Whoami Command', () => {
   let getEmailStub;
   before(function () {
     getEmailStub = sinon.stub(WhoamiCommand.prototype, 'email').get(function getterFn() {
-      return '***REMOVED***';
+      return 'test@contentstack.com';
     });
   });
 
@@ -17,7 +17,7 @@ describe('Whoami Command', () => {
 
   it('Logged in user, displays the username', async function () {
     const getEmailStub = sinon.stub(WhoamiCommand.prototype, 'email').get(function getterFn() {
-      return '***REMOVED***';
+      return 'test@contentstack.com';
     });
     const successMessageStub = sinon.stub(cliux, 'print').returns();
     await WhoamiCommand.run([]);
diff --git a/packages/contentstack-bootstrap/src/bootstrap/utils.ts b/packages/contentstack-bootstrap/src/bootstrap/utils.ts
index 13e2bfab4d..daa053e1ae 100644
--- a/packages/contentstack-bootstrap/src/bootstrap/utils.ts
+++ b/packages/contentstack-bootstrap/src/bootstrap/utils.ts
@@ -143,7 +143,7 @@ const envFileHandler = async (
   let appHost: string;
   const managementAPIHost = region?.cma?.substring('8');
   const regionName = region && region.name && region.name.toLowerCase();
-  previewHost = region?.cda?.substring(8)?.replace('cdn', 'rest-preview');
+  previewHost = region?.uiHost?.substring(8)?.replace('app', 'rest-preview');
   appHost = region?.uiHost?.substring(8);
   const isUSRegion = regionName === 'us' || regionName === 'na';
   if (regionName !== 'eu' && !isUSRegion) {
diff --git a/packages/contentstack-export/test/integration/init.test.js b/packages/contentstack-export/test/integration/init.test.js
index 105e507ce8..7f6f01d8b8 100644
--- a/packages/contentstack-export/test/integration/init.test.js
+++ b/packages/contentstack-export/test/integration/init.test.js
@@ -14,7 +14,7 @@ const { APP_ENV, DELIMITER, KEY_VAL_DELIMITER } = process.env
 const crypto = new NodeCrypto({
   typeIdentifier: '◈',
   algorithm: 'aes-192-cbc',
-  encryptionKey: ENCRYPTION_KEY || '***REMOVED***'
+  encryptionKey: ENCRYPTION_KEY || 'gjh67567mn'
 });
 
 module.exports = (region) => {
diff --git a/packages/contentstack-import/.env.sample b/packages/contentstack-import/.env.sample
index f408e61bf1..8015940072 100644
--- a/packages/contentstack-import/.env.sample
+++ b/packages/contentstack-import/.env.sample
@@ -1,8 +1,8 @@
 APP_ENV=DEV
 # PROD, STAGE
 
-NA_PASSWORD=***REMOVED***
-NA_USERNAME=***REMOVED***
+NA_PASSWORD=Test1234
+NA_USERNAME=test@contentstack.com
 
 # Config package specific
 ENCRYPT_CONF=true
diff --git a/packages/contentstack-import/test/integration/init.test.js b/packages/contentstack-import/test/integration/init.test.js
index 67e8998b17..a0490052d1 100644
--- a/packages/contentstack-import/test/integration/init.test.js
+++ b/packages/contentstack-import/test/integration/init.test.js
@@ -14,7 +14,7 @@ const { DELIMITER, KEY_VAL_DELIMITER } = process.env;
 const crypto = new NodeCrypto({
   typeIdentifier: '◈',
   algorithm: 'aes-192-cbc',
-  encryptionKey: ENCRYPTION_KEY || '***REMOVED***'
+  encryptionKey: ENCRYPTION_KEY || 'gjh67567mn'
 });
 
 module.exports = (region) => {
diff --git a/packages/contentstack-migrate-rte/test/dummy/entriesResponse.json b/packages/contentstack-migrate-rte/test/dummy/entriesResponse.json
index b8dcbb7c9c..314af01eb4 100644
--- a/packages/contentstack-migrate-rte/test/dummy/entriesResponse.json
+++ b/packages/contentstack-migrate-rte/test/dummy/entriesResponse.json
@@ -260,7 +260,7 @@
                     "file_size": "344996",
                     "tags": [],
                     "filename": "image.png",
-                    "url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
+                    "url": "***REMOVED***46cc5/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
                     "ACL": [],
                     "is_dir": false,
                     "parent_uid": null,
@@ -287,7 +287,7 @@
                                     "file_size": "7701",
                                     "tags": [],
                                     "filename": "48558898.jpeg",
-                                    "url": "***REMOVED***bltb13b08635ebffdc4/6048c0c887ab224351aab15f/48558898.jpeg",
+                                    "url": "***REMOVED***46cc5/bltb13b08635ebffdc4/6048c0c887ab224351aab15f/48558898.jpeg",
                                     "ACL": [],
                                     "is_dir": false,
                                     "parent_uid": null,
@@ -309,7 +309,7 @@
                                     "file_size": "5403",
                                     "tags": [],
                                     "filename": "download.jpeg",
-                                    "url": "***REMOVED***bltb85f710a4a984858/6049fa897477c27b7b34443d/download.jpeg",
+                                    "url": "***REMOVED***46cc5/bltb85f710a4a984858/6049fa897477c27b7b34443d/download.jpeg",
                                     "ACL": [],
                                     "is_dir": false,
                                     "parent_uid": null,
@@ -332,7 +332,7 @@
                                     "file_size": "5906",
                                     "tags": [],
                                     "filename": "download_(2).jpeg",
-                                    "url": "***REMOVED***blt3d60320b8e0b9b0a/6040b819116a7015b467265e/download_(2).jpeg",
+                                    "url": "***REMOVED***46cc5/blt3d60320b8e0b9b0a/6040b819116a7015b467265e/download_(2).jpeg",
                                     "ACL": [],
                                     "is_dir": false,
                                     "parent_uid": null,
@@ -363,7 +363,7 @@
                                     "file_size": "344996",
                                     "tags": [],
                                     "filename": "image.png",
-                                    "url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
+                                    "url": "***REMOVED***46cc5/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
                                     "ACL": [],
                                     "is_dir": false,
                                     "parent_uid": null,
@@ -394,7 +394,7 @@
                         "file_size": "344996",
                         "tags": [],
                         "filename": "image.png",
-                        "url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
+                        "url": "***REMOVED***46cc5/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
                         "ACL": [],
                         "is_dir": false,
                         "parent_uid": null,
diff --git a/packages/contentstack-migration/README.md b/packages/contentstack-migration/README.md
index 53eda842c2..71128f8bff 100644
--- a/packages/contentstack-migration/README.md
+++ b/packages/contentstack-migration/README.md
@@ -5,7 +5,7 @@ The Contentstack CLI’s “Migration” plugin allows developers to automate th
 [![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
 [![Version](https://img.shields.io/npm/v/@contentstack/cli-migration.svg)](https://npmjs.org/package/@contentstack/cli-migration)
 [![Downloads/week](https://img.shields.io/npm/dw/@contentstack/cli-migration.svg)](https://npmjs.org/package/@contentstack/cli-migration)
-[![License](https://img.shields.io/npm/l/@contentstack/cli-migration.svg)](https://github.com/***REMOVED***/cli-migration/blob/master/package.json)
+[![License](https://img.shields.io/npm/l/@contentstack/cli-migration.svg)](https://github.com/ninadhatkar/cli-migration/blob/master/package.json)
 
 <!-- toc -->
 * [@contentstack/cli-migration](#contentstackcli-migration)

From 62102adb1d143069502703cc9e0dd6cd9e6d84c9 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Fri, 9 Feb 2024 19:09:54 +0530
Subject: [PATCH 12/12] Audit command 'fixed' status correction

---
 packages/contentstack-audit/src/modules/content-types.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
index 28b7d0b107..23c0f8af37 100644
--- a/packages/contentstack-audit/src/modules/content-types.ts
+++ b/packages/contentstack-audit/src/modules/content-types.ts
@@ -538,10 +538,10 @@ export default class ContentType {
         const refErrorObj = {
           tree,
           display_name,
-          fixStatus: 'Fixed',
-          missingRefs: [reference_to],
           ct_uid: this.currentUid,
           name: this.currentTitle,
+          missingRefs: [reference_to],
+          fixStatus: this.fix ? 'Fixed' : undefined,
           treeStr: tree.map(({ name }) => name).join(' ➜ '),
         };