Merge pull request #1028 from contentstack/dev

Dev

Author: umeshmore45

.gitattributes

@@ -0,0 +1,3 @@
+# Windows checkouts must not use CRLF on shell scripts — breaks Linux shebang/exec
+# (symptom: exec /usr/local/bin/docker-entrypoint.sh: no such file or directory)
+*.sh text eol=lf

api/package-lock.json

@@ -51,15 +51,18 @@
     "html-to-json-parser": "^2.0.1",
     "jsdom": "^24.1.0",
     "jsonwebtoken": "^9.0.3",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "lowdb": "^7.0.1",
     "mkdirp": "^3.0.1",
     "mysql2": "^3.16.2",
     "p-limit": "^6.2.0",
     "php-serialize": "^5.1.3",
     "socket.io": "^4.7.5",
     "uuid": "^9.0.1",
-    "winston": "^3.11.0"
+    "winston": "^3.11.0",
+    "@emnapi/core": "1.9.1",
+    "@emnapi/runtime" : "1.9.1",
+    "@emnapi/wasi-threads": "1.2.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
@@ -95,7 +98,8 @@
     "glob": ">=11.1.0",
     "rollup": ">=4.59.0",
     "tar": ">=7.5.8",
-    "@tootallnate/once": ">=3.0.1"
+    "@tootallnate/once": ">=3.0.1",
+    "undici": ">=7.24.0"
   },
   "keywords": []
 }

api/package.json

@@ -278,7 +278,15 @@ const deleteTestStack = async (req: Request): Promise<LoginServiceType> => {
  */
 const startTestMigration = async (req: Request): Promise<any> => {
   const { orgId, projectId } = req?.params ?? {};
-  const { region, user_id } = req?.body?.token_payload ?? {};
+  const { region, user_id, is_sso } = req?.body?.token_payload ?? {};
+
+
+  if (is_sso !== true && is_sso !== false) {
+    throw new BadRequestError(
+      'Invalid token_payload.is_sso; expected a boolean value.',  
+    );
+  }
+
   await ProjectModelLowdb.read();
   const project: any = ProjectModelLowdb.chain
     .get('projects')
@@ -406,6 +414,7 @@ const startTestMigration = async (req: Request): Promise<any> => {
       destinationStackId: project?.current_test_stack_id,
       region,
       user_id,
+      is_sso,
     });
 
     await marketPlaceAppService?.createAppManifest({
@@ -652,7 +661,14 @@ const startTestMigration = async (req: Request): Promise<any> => {
  */
 const startMigration = async (req: Request): Promise<any> => {
   const { orgId, projectId } = req?.params ?? {};
-  const { region, user_id } = req?.body?.token_payload ?? {};
+  const { region, user_id, is_sso } = req?.body?.token_payload ?? {};
+
+  if (typeof is_sso !== 'boolean') {
+    throw new BadRequestError(
+      'Missing or invalid SSO flag in token payload: expected boolean "is_sso".',
+    );
+  }
+  
   await ProjectModelLowdb.read();
   const project: any = ProjectModelLowdb.chain
     .get('projects')
@@ -793,6 +809,7 @@ const startMigration = async (req: Request): Promise<any> => {
       destinationStackId: project?.destination_stack_id,
       region,
       user_id,
+      is_sso,
     });
     await marketPlaceAppService?.createAppManifest({
       orgId,

api/src/services/migration.service.ts

@@ -1026,8 +1026,27 @@ const writeGlobalField = async (schema: any, globalSave: string) => {
   }
 };
 
-const existingCtMapper = async ({ keyMapper, contentTypeUid, projectId, region, user_id, type}: any) => {
+const resolveIsSsoFlag = (is_sso: any): boolean => {
+  if (typeof is_sso === 'boolean') {
+    return is_sso;
+  }
+
+  if (is_sso === 'true') {
+    return true;
+  }
+
+  if (is_sso === 'false') {
+    return false;
+  }
+
+  throw new Error(
+    `Invalid token_payload.is_sso in existingCtMapper; expected boolean, received: ${JSON.stringify(is_sso)}`
+  );
+};
+
+const existingCtMapper = async ({ keyMapper, contentTypeUid, projectId, region, user_id, is_sso, type}: any) => {
   try {
+    const normalizedIsSso = resolveIsSsoFlag(is_sso);
     const ctUid = keyMapper?.[contentTypeUid];
 
     if(type === 'global_field') {
@@ -1040,7 +1059,8 @@ const existingCtMapper = async ({ keyMapper, contentTypeUid, projectId, region,
         body: {
           token_payload: {
             region,
-            user_id
+            user_id,
+            is_sso: normalizedIsSso
           }
         }
       }
@@ -1055,7 +1075,8 @@ const existingCtMapper = async ({ keyMapper, contentTypeUid, projectId, region,
         body: {
           token_payload: {
             region,
-            user_id
+            user_id,
+            is_sso: normalizedIsSso
           }
         }
       }
@@ -1141,7 +1162,7 @@ const mergeTwoCts = async (ct: any, mergeCts: any) => {
   return ctData;
 }
 
-export const contenTypeMaker = async ({ contentType, destinationStackId, projectId, newStack, keyMapper, region, user_id }: any) => {
+export const contenTypeMaker = async ({ contentType, destinationStackId, projectId, newStack, keyMapper, region, user_id, is_sso }: any) => {
   const marketPlacePath = path.join(process.cwd(), MIGRATION_DATA_CONFIG.DATA, destinationStackId);
   const srcFunc = 'contenTypeMaker';
 
@@ -1155,7 +1176,7 @@ export const contenTypeMaker = async ({ contentType, destinationStackId, project
   if (Object?.keys?.(keyMapper)?.length &&
     keyMapper?.[contentType?.contentstackUid] !== "" &&
     keyMapper?.[contentType?.contentstackUid] !== undefined) {
-    currentCt = await existingCtMapper({ keyMapper, contentTypeUid: contentType?.contentstackUid, projectId, region, user_id , type: contentType?.type});
+    currentCt = await existingCtMapper({ keyMapper, contentTypeUid: contentType?.contentstackUid, projectId, region, user_id, is_sso, type: contentType?.type});
   }
 
   // Safe: ensures we never pass undefined to the builder

api/src/utils/content-type-creator.utils.ts

@@ -3,7 +3,7 @@ import ContentTypesMapperModelLowdb from "../models/contentTypesMapper-lowdb.js"
 import FieldMapperModel from "../models/FieldMapper.js";
 import { contenTypeMaker } from "./content-type-creator.utils.js";
 
-export const fieldAttacher = async ({ projectId, orgId, destinationStackId, region, user_id }: any) => {
+export const fieldAttacher = async ({ projectId, orgId, destinationStackId, region, user_id, is_sso }: any) => {
   await ProjectModelLowdb.read();
   const projectData: any = ProjectModelLowdb.chain.get("projects").find({
     id: projectId,
@@ -27,7 +27,7 @@ export const fieldAttacher = async ({ projectId, orgId, destinationStackId, regi
           return field;
         })
       }
-      await contenTypeMaker({ contentType, destinationStackId, projectId, newStack: projectData?.stackDetails?.isNewStack, keyMapper: projectData?.mapperKeys, region, user_id })
+      await contenTypeMaker({ contentType, destinationStackId, projectId, newStack: projectData?.stackDetails?.isNewStack, keyMapper: projectData?.mapperKeys, region, user_id, is_sso })
       contentTypes?.push?.(contentType);
     }
   }

api/src/utils/field-attacher.utils.ts

@@ -1,13 +1,13 @@
-import contentstack from '@contentstack/marketplace-sdk';
+import {client} from '@contentstack/marketplace-sdk';
 import { DEVURLS } from '../constants/index.js';
 
 
 
 
 export const getAllApps = async ({ organizationUid, authtoken, region }: any) => {
   try {
-    const client = contentstack.client({ authtoken, host: DEVURLS?.[region] ?? DEVURLS?.NA });
-    const data = await client.marketplace(organizationUid).findAllApps();
+    const contentstackclient = client({ authtoken, host: DEVURLS?.[region] ?? DEVURLS?.NA });
+    const data = await contentstackclient.marketplace(organizationUid).findAllApps();
     return data?.items;
   } catch (err) {
     console.info("🚀 ~ getAllApps ~ err:", err)
@@ -16,8 +16,8 @@ export const getAllApps = async ({ organizationUid, authtoken, region }: any) =>
 
 export const getAppManifestAndAppConfig = async ({ organizationUid, authtoken, region, manifestUid }: any) => {
   try {
-    const client = contentstack.client({ authtoken, host: DEVURLS?.[region] ?? DEVURLS?.NA });
-    const data = await client.marketplace(organizationUid).app(manifestUid).fetch();
+    const contentstackclient = client({ authtoken, host: DEVURLS?.[region] ?? DEVURLS?.NA });
+    const data = await contentstackclient.marketplace(organizationUid).app(manifestUid).fetch();
     return data;
   } catch (err: any) {
     console.info("🚀 ~ getAppManifestAndAppConfig ~ err:", err)

api/src/utils/market-app.utils.ts

@@ -5,9 +5,7 @@ const mockClient = {
 };
 
 vi.mock('@contentstack/marketplace-sdk', () => ({
-  default: {
-    client: vi.fn(() => mockClient),
-  },
+  client: vi.fn(() => mockClient),
 }));
 
 vi.mock('../../../src/constants/index.js', () => ({
@@ -17,7 +15,7 @@ vi.mock('../../../src/constants/index.js', () => ({
   },
 }));
 
-import contentstack from '@contentstack/marketplace-sdk';
+import { client as marketplaceClient } from '@contentstack/marketplace-sdk';
 import {
   getAllApps,
   getAppManifestAndAppConfig,
@@ -48,7 +46,7 @@ describe('market-app.utils', () => {
       });
 
       expect(result).toEqual(mockItems);
-      expect(contentstack.client).toHaveBeenCalledWith({
+      expect(marketplaceClient).toHaveBeenCalledWith({
         authtoken: 'token-xyz',
         host: 'developerhub-api.contentstack.com',
       });
@@ -66,7 +64,7 @@ describe('market-app.utils', () => {
         region: 'EU',
       });
 
-      expect(contentstack.client).toHaveBeenCalledWith({
+      expect(marketplaceClient).toHaveBeenCalledWith({
         authtoken: 'token',
         host: 'eu-developerhub-api.contentstack.com',
       });