From b1f2aa01093d2a3ad8853a12f85eb0d88f45a367 Mon Sep 17 00:00:00 2001
From: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Date: Mon, 12 Aug 2024 09:59:40 +0200
Subject: [PATCH 1/3] http-proxy update

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
---
 system-apps/web-browser-app/nodeServer/package-lock.json | 2 +-
 system-apps/web-browser-app/nodeServer/package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system-apps/web-browser-app/nodeServer/package-lock.json b/system-apps/web-browser-app/nodeServer/package-lock.json
index dd6a09591..e4486ece7 100644
--- a/system-apps/web-browser-app/nodeServer/package-lock.json
+++ b/system-apps/web-browser-app/nodeServer/package-lock.json
@@ -8,7 +8,7 @@
       "name": "org.zowe.zlux.ng2desktop.webbrowser.nodeserver",
       "version": "1.1.1",
       "dependencies": {
-        "http-proxy": "^1.18.0"
+        "http-proxy": "^1.18.1"
       },
       "devDependencies": {
         "@types/express": "^4.16.1",
diff --git a/system-apps/web-browser-app/nodeServer/package.json b/system-apps/web-browser-app/nodeServer/package.json
index a809278b4..a1622b303 100644
--- a/system-apps/web-browser-app/nodeServer/package.json
+++ b/system-apps/web-browser-app/nodeServer/package.json
@@ -7,7 +7,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "http-proxy": "^1.18.0"
+    "http-proxy": "^1.18.1"
   },
   "devDependencies": {
     "@types/express": "^4.16.1",

From 0f4efad234da5db225fdc805f48c5786822c8519 Mon Sep 17 00:00:00 2001
From: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Date: Mon, 12 Aug 2024 10:22:31 +0200
Subject: [PATCH 2/3] Override follow-redirects

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
---
 .../web-browser-app/nodeServer/package-lock.json   | 14 +++++++-------
 .../web-browser-app/nodeServer/package.json        |  7 ++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/system-apps/web-browser-app/nodeServer/package-lock.json b/system-apps/web-browser-app/nodeServer/package-lock.json
index e4486ece7..9d62586f4 100644
--- a/system-apps/web-browser-app/nodeServer/package-lock.json
+++ b/system-apps/web-browser-app/nodeServer/package-lock.json
@@ -108,9 +108,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
-      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
@@ -250,9 +250,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
-      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
     },
     "http-proxy": {
       "version": "1.18.1",
@@ -260,7 +260,7 @@
       "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "requires": {
         "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
+        "follow-redirects": ">=1.15.6",
         "requires-port": "^1.0.0"
       }
     },
diff --git a/system-apps/web-browser-app/nodeServer/package.json b/system-apps/web-browser-app/nodeServer/package.json
index a1622b303..bf954d433 100644
--- a/system-apps/web-browser-app/nodeServer/package.json
+++ b/system-apps/web-browser-app/nodeServer/package.json
@@ -14,5 +14,10 @@
     "@types/http-proxy": "^1.17.3",
     "@types/node": "8.10.59",
     "typescript": "~4.2.0"
-  }
+  },
+  "overrides": {
+    "http-proxy": {
+        "follow-redirects": ">=1.15.6"
+    }
+}
 }

From 7590f8383fb4c8ac2bbd0fa0a06e3e2ab81667ac Mon Sep 17 00:00:00 2001
From: Timothy Gerstel <tim.gerstel@gmail.com>
Date: Mon, 12 Aug 2024 10:17:22 -0400
Subject: [PATCH 3/3] Add v2 in maintenance message to login screen

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>
---
 .../src/app/authentication-manager/login/login.component.html    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/virtual-desktop/src/app/authentication-manager/login/login.component.html b/virtual-desktop/src/app/authentication-manager/login/login.component.html
index 6968f1b83..5775206a7 100644
--- a/virtual-desktop/src/app/authentication-manager/login/login.component.html
+++ b/virtual-desktop/src/app/authentication-manager/login/login.component.html
@@ -69,6 +69,7 @@
       </button>
     </div>
   </div>
+  <p class="login-plugin-version" id="v2_maintenance_message">The Version 2 Desktop is now in maintenance status for the duration of the Zowe Version 2 maintenance schedule.</p>
   <span class="login-plugin-version" id="ZAP_LoginPage_Version">{{getPluginVersion()}}</span>
   </div>
 </div>