@squiz/component-cli-lib 1.52.1-alpha.3 → 1.52.1-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.52.1-alpha.3",
+  "version": "1.52.1-alpha.5",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,12 +13,12 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@squiz/component-lib": "1.52.1-alpha.3",
-    "@squiz/component-web-api-lib": "1.52.1-alpha.3",
-    "@squiz/dx-common-lib": "1.52.1-alpha.3",
-    "@squiz/dx-json-schema-lib": "1.52.1-alpha.3",
-    "@squiz/dx-logger-lib": "1.52.1-alpha.3",
-    "@squiz/virus-scanner-lib": "1.52.1-alpha.3",
+    "@squiz/component-lib": "1.52.1-alpha.5",
+    "@squiz/component-web-api-lib": "1.52.1-alpha.5",
+    "@squiz/dx-common-lib": "1.52.1-alpha.5",
+    "@squiz/dx-json-schema-lib": "1.52.1-alpha.5",
+    "@squiz/dx-logger-lib": "1.52.1-alpha.5",
+    "@squiz/virus-scanner-lib": "1.52.1-alpha.5",
     "@types/cli-color": "2.0.2",
     "@types/express": "4.17.17",
     "@types/jest": "28.1.8",
@@ -32,12 +32,12 @@
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@squiz/render-runtime-lib": "1.52.1-alpha.3",
+    "@squiz/render-runtime-lib": "1.52.1-alpha.5",
     "archiver": "5.3.1",
     "axios": "1.3.2",
     "cli-color": "^2.0.2",
     "open": "^8.4.0",
     "supertest": "^6.2.3"
   },
-  "gitHead": "db2e6a87a503d1d20be4f11355e19128abd73589"
+  "gitHead": "d0d119057d5e743c94a1d7e89f7eb73a61fb035c"
 }

package/src/integration-tests/helper.ts

@@ -84,42 +84,43 @@ const authToken =
 export const managementService = axios.create({
   baseURL: configObj.managementServiceUrl + '/v1',
   headers: {
-    authorization: authToken,
+    Authorization: authToken,
   },
 });
 
 export const managementServiceRoot = axios.create({
   baseURL: configObj.managementServiceUrl,
   headers: {
-    authorization: authToken,
+    Authorization: authToken,
   },
 });
 
 export const renderService = axios.create({
   baseURL: configObj.renderServiceUrl,
   headers: {
-    authorization: authToken,
+    Authorization: authToken,
+    'x-api-key': 'inter-service-api-key',
   },
 });
 
 export const contentService = axios.create({
   baseURL: configObj.contentServiceUrl,
   headers: {
-    authorization: authToken,
+    Authorization: authToken,
   },
 });
 
 export const pageRenderService = axios.create({
   baseURL: configObj.pageRenderServiceUrl,
   headers: {
-    authorization: authToken,
+    Authorization: authToken,
   },
 });
 
 export const jobService = axios.create({
   baseURL: configObj.jobServiceUrl,
   headers: {
-    authorization: authToken,
+    Authorization: authToken,
   },
 });
 

package/src/integration-tests/upload-and-render-component.integration.spec.ts

@@ -19,6 +19,42 @@ import { logger } from '../upload-component-folder';
 import { ComponentSetWebModelForCreate } from '@squiz/component-lib';
 import fsp from 'fs/promises';
 import { randomUUID } from 'crypto';
+import { buildDevelopmentJwt, DxpServiceId } from '@squiz/dxp-auth-lib';
+
+const authToken =
+  'Bearer ' +
+  buildDevelopmentJwt({
+    service: {
+      [DxpServiceId.contentStore]: {
+        privileges: [
+          'CONTENT_SCHEMA_READ',
+          'CONTENT_SCHEMA_WRITE',
+          'CONTENT_ITEM_READ',
+          'CONTENT_ITEM_WRITE',
+          'SETTINGS_READ',
+          'SETTINGS_WRITE',
+          'PAGE_CONTENTS_WRITE',
+          'PAGE_CONTENTS_READ',
+        ],
+      },
+      [DxpServiceId.components]: {
+        privileges: [
+          'COMPONENT_READ',
+          'COMPONENT_WRITE',
+          'COMPONENT_DEPLOY',
+          'COMPONENT_SET_WRITE',
+          'COMPONENT_DELETE',
+          'COMPONENT_SET_WRITE',
+          'COMPONENT_SET_READ',
+          'COMPONENT_SET_ENVIRONMENT_READ',
+          'COMPONENT_SET_ENVIRONMENT_WRITE',
+        ],
+      },
+      [DxpServiceId.segmentation]: {
+        privileges: ['SEGMENT_READ'],
+      },
+    },
+  });
 
 const webPath = 'set-' + randomUUID();
 const contentItemId = randomUUID();
@@ -383,10 +419,10 @@ describe('uploading a component', () => {
     });
 
     it('Should preserve input field order when uploading schema to content store', async () => {
-      const response = await supertest(configObj.contentServiceUrl).get(
-        '/content-schema/smoke-test-components/cmp-property-order/1.0.0/main',
-      );
-
+      const response = await supertest(configObj.contentServiceUrl)
+        .get('/content-schema/smoke-test-components/cmp-property-order/1.0.0/main')
+        .set('Authorization', authToken)
+        .send();
       // Relates to DEVX-891, property order is preserved so that we can reliably draw a UI from it.
       //
       // The sequence here is important and should follow the rules defined here:
@@ -414,7 +450,7 @@ describe('uploading a component', () => {
         '"null":{"type":"null","default":null}';
 
       expect(response.status).toEqual(200);
-      expect(response.text).toEqual(
+      expect(response.text).toContain(
         `{"name":"smoke-test-components/cmp-property-order/1.0.0/main",` +
           `"schema":{"type":"object","properties":{${expectedProperties}},"required":[]},"contentSchemaType":"component"}`,
       );