b/2527 fix parsing of dcatConfig query param

src/index.test.ts

@@ -168,7 +168,7 @@ describe('Output Plugin', () => {
         });
     })
 
-    it('Properly passes custom dcat configurations to getDataStreamDcatUs11', async () => {
+    it('Properly passes a site\'s custom dcat configurations to getDataStreamDcatUs11 when no dcatConfig is provided', async () => {
       // Change fetchSite's return value to include a custom dcat config
       const customConfigSiteModel: IModel = _.cloneDeep(mockSiteModel);
       customConfigSiteModel.data.feeds = {
@@ -198,7 +198,7 @@ describe('Output Plugin', () => {
         });
     });
 
-    it('Properly passes the ?dcatConfig query param to getDataStreamDcatUs11', async () => {
+    it('Properly passes a valid stringified ?dcatConfig query param to getDataStreamDcatUs11', async () => {
       const dcatConfig = {
         planet: 'tatooine'
       }
@@ -213,6 +213,22 @@ describe('Output Plugin', () => {
         });
     });
 
+    it('Properly passes the ?dcatConfig query param as an object to getDataStreamDcatUs11', async () => {
+      const dcatConfig = {
+        planet: 'tatooine'
+      }
+
+      await request(app)
+        .get('/dcat')
+        .query({ dcatConfig })
+        .set('host', siteHostName)
+        .expect('Content-Type', /application\/json/)
+        .expect(200)
+        .expect(() => {
+          expect(mockGetDataStreamDcatUs11).toHaveBeenCalledWith(mockSiteModel.item, dcatConfig);
+        });
+    });
+
     it('Passes the site dcat config to getDataStreamDcatUs11 when ?dcatConfig is invalid json', async () => {
       // Change fetchSite's return value to include a custom dcat config
       const customConfigSiteModel: any = _.cloneDeep(mockSiteModel);

src/index.ts

@@ -36,9 +36,13 @@ export = class OutputDcatUs11 {
       const siteModel = await fetchSite(req.hostname, this.getRequestOptions(portalUrl));
 
       // Use dcatConfig query param if provided, else default to site's config
-      const dcatConfig = typeof req.query.dcatConfig === 'object'
-        ? req.query.dcatConfig
-        : _.get(siteModel, 'data.feeds.dcatUS11');
+      let dcatConfig = typeof req.query.dcatConfig === 'string'
+        ? this.parseProvidedDcatConfig(req.query.dcatConfig as string)
+        : req.query.dcatConfig;
+
+      if (!dcatConfig) {
+        dcatConfig = _.get(siteModel, 'data.feeds.dcatUS11');
+      }
 
       const { stream: dcatStream, dependencies } = getDataStreamDcatUs11(siteModel.item, dcatConfig);
       const apiTerms = getApiTermsFromDependencies(dependencies);
@@ -69,6 +73,14 @@ export = class OutputDcatUs11 {
     };
   }
 
+  private parseProvidedDcatConfig(dcatConfig: string) {
+    try {
+      return JSON.parse(dcatConfig);
+    } catch (err) {
+      return undefined;
+    }
+  }
+
   private getCatalogSearchRequest(
     catalog: any,
     portalUrl: string,