@squiz/render-runtime-lib 1.73.0 → 1.74.0

package/lib/component-runner/ContentRuntimeService.d.ts

@@ -9,6 +9,6 @@ export declare class ContentRuntimeService {
     dynamicContentItemService: DynamicContentItemService;
     previewResolver: ComponentContentUriResolverForPreview;
     constructor(contentServiceUrl: string, manifest: ManifestModel, manifestPath?: string | undefined);
-    getContentItemProduction(uri: string, dxpApiKey: string): Promise<UriResource | undefined>;
+    getContentItemProduction(uri: string, dxpApiKey: string, context?: string): Promise<UriResource | undefined>;
     getContentItemPreview(uri: string): Promise<UriResource | undefined>;
 }

package/lib/index.js

@@ -2147,14 +2147,9 @@ var RenderInputService = class {
     };
   }
   getQueryParametersFromRequest(request, componentFunction) {
-    if (!componentFunction.queryParameters) {
-      return {};
-    }
     const queryParameters = {};
-    for (const parameter of Object.keys(componentFunction.queryParameters)) {
-      if (componentFunction.queryParameters[parameter].required && request.expressRequest.query[parameter] === void 0) {
-        throw new import_dx_common_lib9.BadRequestError(`Required query parameter '${parameter}' is missing`);
-      }
+    const whitelistQueryParameters = ["_contentContext"];
+    for (const parameter of whitelistQueryParameters) {
       if (request.expressRequest.query[parameter] === void 0) {
         continue;
       }
@@ -2163,6 +2158,20 @@ var RenderInputService = class {
       }
       queryParameters[parameter] = request.expressRequest.query[parameter];
     }
+    if (componentFunction.queryParameters) {
+      for (const parameter of Object.keys(componentFunction.queryParameters)) {
+        if (componentFunction.queryParameters[parameter].required && request.expressRequest.query[parameter] === void 0) {
+          throw new import_dx_common_lib9.BadRequestError(`Required query parameter '${parameter}' is missing`);
+        }
+        if (request.expressRequest.query[parameter] === void 0) {
+          continue;
+        }
+        if (typeof request.expressRequest.query[parameter] !== "string") {
+          throw new import_dx_common_lib9.BadRequestError(`Value for query parameter '${parameter}' must be a string`);
+        }
+        queryParameters[parameter] = request.expressRequest.query[parameter];
+      }
+    }
     return queryParameters;
   }
   getPreviewRuntimeSet(manifest, previewEnvVars) {
@@ -2763,6 +2772,17 @@ var MockedComponentSetServiceForProduction = class extends import_component_lib4
             type: "server"
           }
         ],
+        "unit-test-components/test-component-query-parameters": [
+          {
+            version: "1.0.0",
+            environmentVariables: { "some-var": "test-component-query-parameters v1.0.0 value" },
+            displayName: setName,
+            description: "some-description",
+            icon: void 0,
+            editable: true,
+            type: "server"
+          }
+        ],
         "unit-test-components/test-npm-modules": [
           {
             version: "1.0.0",