Merge pull request #418 from zowe/feature/v2/merge-v1

Merge v1 changes into v2
zowe · Apr 12, 2022 · 09e6850 · 09e6850
2 parents f0cd9ee + 038047d
commit 09e6850
Show file tree

Hide file tree

Showing 5 changed files with 2,865 additions and 52 deletions.
diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml
@@ -99,3 +99,4 @@ jobs:
 
       - name: '[Prep 7] deploy'
         uses: zowe-actions/zlux-builds/core/[email protected]/main
+
diff --git a/lib/apiml.js b/lib/apiml.js
@@ -78,7 +78,8 @@ const MEDIATION_LAYER_INSTANCE_DEFAULTS = (zluxProto, zluxHostname, zluxPort) =>
       +' Proxy Server',
     'mfaas.api-info.apiVersionProperties.v1.version': '1.0.0',
     'mfaas.api-info.apiVersionProperties.v1.version': '1.0.0',
-    'apiml.apiInfo.api-v1.swaggerUrl':`${zluxProto}://${zluxHostname}:${zluxPort}/api-docs/server`
+    'apiml.apiInfo.api-v1.swaggerUrl':`${zluxProto}://${zluxHostname}:${zluxPort}/api-docs/server`,
+    'apiml.authentication.scheme': 'zoweJwt'
   }
 }};
 

diff --git a/lib/util.js b/lib/util.js
@@ -402,15 +402,14 @@ module.exports.getRemoteIframeTemplate = function(remoteUrl) {
 
 module.exports.makeRemoteUrl = function(destination, req, serverConfig) {
   let referer = req.get('Referer');
-  let hostname = referer === '' ? '' : new URL(referer).hostname;
   loggers.utilLogger.debug(`referer: ${referer}`);
 
   let zoweExternalHost;
   let zoweExternalPort;
-
+  
   if(destination.includes('ZOWE_EXTERNAL_HOST') || destination.includes('ZWE_EXTERNAL_HOST')) {
-    if( hostname > '') {
-      zoweExternalHost = hostname; 
+    if( referer > '') {
+      zoweExternalHost = referer.split(':')[1].substring(2); 
     } else if (process.env.ZWE_EXTERNAL_HOST) {
       zoweExternalHost = process.env.ZWE_EXTERNAL_HOST;
     } else if (process.env.ZOWE_EXTERNAL_HOST) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,3 +99,4 @@ jobs:

		- name: '[Prep 7] deploy'
		uses: zowe-actions/zlux-builds/core/[email protected]/main