Sending all of hostConfig. (blackbaud#202)

Blackbaud-DiHuynh · Feb 7, 2020 · 3907f09 · 3907f09
1 parent b878948
commit 3907f09
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/test/utils-host-utils.spec.js b/test/utils-host-utils.spec.js
@@ -24,12 +24,12 @@ describe('host-utils', () => {
     mock('html-webpack-plugin/lib/chunksorter', {
       dependency: (chunks) => chunks
     });
-    utils = require('../utils/host-utils');
+    utils = mock.reRequire('../utils/host-utils');
   });
 
   afterEach(() => {
     utils = null;
-    mock.stop('html-webpack-plugin/lib/chunksorter');
+    mock.stopAll();
   });
 
   it('should resolve a url, trim trailing slash from host and leading slash from url', () => {
@@ -112,4 +112,20 @@ describe('host-utils', () => {
     mock.stop('../package.json');
   });
 
+  it('should add host config', () => {
+    const expectedHostConfig = {
+      url: 'any-url',
+      frameOptions: {
+        none: true
+      }
+    };
+
+    skyPagesConfig.skyux.host = expectedHostConfig;
+
+    const resolved = utils.resolve('/url', '', [], skyPagesConfig);
+    const decoded = decode(resolved);
+
+    expect(decoded.host).toEqual(expectedHostConfig);
+  });
+
 });
diff --git a/utils/host-utils.js b/utils/host-utils.js
@@ -12,10 +12,12 @@ const skyPagesConfigUtil = require('../config/sky-pages/sky-pages.config');
  * @param {Object} skyPagesConfig
  */
 function resolve(url, localUrl, chunks, skyPagesConfig) {
-  let host = skyPagesConfig.skyux.host.url;
-  let config = {
+  const hostConfig = skyPagesConfig.skyux.host;
+
+  const config = {
     scripts: getScripts(chunks),
-    localUrl: localUrl
+    localUrl,
+    host: hostConfig
   };
 
   if (skyPagesConfig.skyux.app && skyPagesConfig.skyux.app.externals) {
@@ -28,14 +30,15 @@ function resolve(url, localUrl, chunks, skyPagesConfig) {
   }
 
   // Trim trailing slash since geAppBase adds it
-  if (host && host.charAt(host.length - 1) === '/') {
-    host = host.slice(0, -1);
+  let hostUrl = hostConfig.url;
+  if (hostUrl && hostUrl.charAt(hostUrl.length - 1) === '/') {
+    hostUrl = hostUrl.slice(0, -1);
   }
 
   const delimeter = url.indexOf('?') === -1 ? '?' : '&';
   const encoded = Buffer.from(JSON.stringify(config)).toString('base64');
   const base = skyPagesConfigUtil.getAppBase(skyPagesConfig);
-  const resolved = `${host}${base}${url}${delimeter}local=true&_cfg=${encoded}`;
+  const resolved = `${hostUrl}${base}${url}${delimeter}local=true&_cfg=${encoded}`;
 
   return resolved;
 }