Zowe Suite v2.15.0

CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to the Zlux Server Framework package will be documented in this file..
 This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.
 
+## 2.15.0
+- Bugfix: App-server could not run in HTTP mode for AT-TLS setup because it was not able to merge HTTPS and HTTP addresses. (#984)
+
 ## 2.14.0
 - Bugfix: App-server could not load when multiple discovery servers were present and the app-server was unable to reach the first one specified. Now, the app-server will iterate through the list of servers until an accessible one is reached. (#522)
 - Bugfix: App-server would not correctly detect when it was running in a high-availability configuration environment. (#521)

lib/apimlStorage.ts

@@ -162,7 +162,7 @@ async function apimlDoRequest(req: ApimlRequest): Promise<ApimlResponse> {
       headers: req.headers,
     });
     const apimlResponse: ApimlResponse = {
-      headers: response.headers,
+      headers: response.headers as http.IncomingHttpHeaders,
       statusCode: response.status,
       json: response.data
     };

lib/util.js

@@ -514,10 +514,11 @@ module.exports.getBestHostname = function(zoweConfig) {
 }
 
 module.exports.getListeningAddresses = function(zoweConfig) {
-  let addrs = getHttpsListeningAddresses(zoweConfig);
+  let httpsAddrsCollection = getHttpsListeningAddresses(zoweConfig);
+  let addrs = [...httpsAddrsCollection];
   let otherAddrs = getHttpListeningAddresses(zoweConfig);
   otherAddrs.forEach((addr)=> {
-    if (addrs.indexOf(addr) == -1) { addrs.push(otherAddrs); }
+    if (addrs.indexOf(addr) == -1) { addrs.push(addr); }
   });
   return addrs;
 }

package.json

@@ -40,7 +40,7 @@
     "@rocketsoftware/eureka-js-client": "~4.5.6",
     "@rocketsoftware/express-ws": "^5.0.0",
     "accept-language-parser": "~1.5.0",
-    "axios": "~0.22.0",
+    "axios": "^1.6.7",
     "bluebird": "~3.5.1",
     "body-parser": "~1.20.0",
     "cookie-parser": "~1.4.3",
@@ -69,16 +69,16 @@
     "@types/connect": "3.4.35",
     "@types/express": "4.17.17",
     "@types/express-serve-static-core": "4.17.35",
-    "@types/node": "~14.0.0",
     "@types/mime": "3.0.1",
+    "@types/node": "~14.0.0",
     "@types/qs": "6.9.3",
     "chai": "~4.2.0",
     "chai-http": "~4.2.0",
     "mocha": "~10.2.0",
     "typescript": "~5.0.0"
   },
   "optionalDependencies": {
-    "keyring_js": "~1.1.0",
-    "fsevents": "~2.3.2"
+    "fsevents": "~2.3.2",
+    "keyring_js": "~1.1.0"
   }
 }