From 353312ac88963026a93c491813e15a5cfd49ccd9 Mon Sep 17 00:00:00 2001
From: Timothy Gerstel <tim.gerstel@gmail.com>
Date: Wed, 31 Jan 2024 11:55:59 -0500
Subject: [PATCH 1/2] Bump axios 0.22.0 -> 1.6.7

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>
---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3b0054ad..797db2c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@rocketsoftware/eureka-js-client": "~4.5.3",
         "@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.18.3",
         "cookie-parser": "~1.4.3",
@@ -105,7 +105,7 @@
         "@types/node": "~6.0.0",
         "@types/qs": "6.9.3",
         "accept-language-parser": "~1.5.0",
-        "axios": "~0.22.0",
+        "axios": "~1.6.7",
         "bluebird": "~3.5.1",
         "body-parser": "~1.18.3",
         "chai": "~4.2.0",

From fda2a729c378d35ff23f2e49d6dac897ca477561 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 20 Feb 2024 15:05:27 -0500
Subject: [PATCH 2/2] Add option meant for debugging where app-server can use
 the older shell plugins install process instead of the configmgr one even
 when zowe.useconfigmgr is set, if desired, by setting
 components.app-server.zowe.useconfigmgr as an override

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/configure.sh               |  4 +++-
 schemas/app-server-config.json | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bin/configure.sh b/bin/configure.sh
index 36276d84..499eaac1 100755
--- a/bin/configure.sh
+++ b/bin/configure.sh
@@ -54,7 +54,9 @@ cd ../lib
 CONFIG_FILE=$ZWE_CLI_PARAMETER_CONFIG $NODE_BIN initInstance.js
 
 cd ${COMPONENT_HOME}/share/zlux-app-server/bin/init
-if [ "${ZWE_zowe_useConfigmgr}" = "true" ]; then
+if [ "${ZWE_components_app_server_zowe_useConfigmgr}" = "false" ]; then
+  . ./plugins-init.sh  
+elif [ "${ZWE_zowe_useConfigmgr}" = "true" ]; then
   _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/app-server/share/zlux-app-server/bin/init/plugins-init.js"
 else
   . ./plugins-init.sh
diff --git a/schemas/app-server-config.json b/schemas/app-server-config.json
index b196a8a5..fbdbc51f 100755
--- a/schemas/app-server-config.json
+++ b/schemas/app-server-config.json
@@ -6,6 +6,18 @@
   "type": "object",
   "additionalProperties": true,
   "properties": {
+    "zowe": {
+      "type": "object",
+      "additionalProperties": true,
+      "description": "Contains customizations from the Zowe global configuration.",
+      "properties": {
+        "useConfigmgr": {
+          "type": "boolean",
+          "default": true,
+          "description": "Determines whether configmgr will be used during the startup proceedure, such as to register plugins."
+        }
+      }
+    },
     "node": {
       "type": "object",
       "description": "Configuration options specific to the app-server and things it depends upon",