From 278400ebdc7835910a58c1ae48209a60925c713e Mon Sep 17 00:00:00 2001
From: Richard Conway <richard@rconway.co.uk>
Date: Fri, 15 Mar 2024 16:59:21 +0000
Subject: [PATCH] Update Application Hub to chart version `2.0.59` to add
 support for path-prefix (`BASE_URL`)

---
 deploy/eoepca/application-hub.sh | 15 +++++++++++----
 docs/index.md                    |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/deploy/eoepca/application-hub.sh b/deploy/eoepca/application-hub.sh
index 190f8d11..4ebbf19a 100755
--- a/deploy/eoepca/application-hub.sh
+++ b/deploy/eoepca/application-hub.sh
@@ -15,6 +15,11 @@ initIpDefaults
 
 domain="${2:-${default_domain}}"
 NAMESPACE="app-hub"
+BASE_URL="/"
+
+if [[ "${BASE_URL}" != */ ]]; then
+  BASE_URL="${BASE_URL}/"
+fi
 
 main() {
   deployService
@@ -30,7 +35,7 @@ deployService() {
       --timeout 10m \
       --repo https://eoepca.github.io/helm-charts \
       --namespace "${NAMESPACE}" --create-namespace \
-      --version 2.0.58
+      --version 2.0.59
   fi
 }
 
@@ -42,7 +47,7 @@ ingress:
   hosts:
     - host: applicationhub.${domain}
       paths:
-        - path: /
+        - path: ${BASE_URL}
           pathType: ImplementationSpecific
   tls:
     - secretName: applicationhub-tls
@@ -53,19 +58,21 @@ ingress:
 jupyterhub:
   fullnameOverride: "application-hub"
   hub:
+    baseUrl: ${BASE_URL}
     existingSecret: application-hub-secrets
     extraEnv: 
         JUPYTERHUB_ENV: "dev"
         JUPYTERHUB_SINGLE_USER_IMAGE: "eoepca/pde-container:1.0.3"
-        OAUTH_CALLBACK_URL: $(httpScheme)://applicationhub.${domain}/hub/oauth_callback
+        OAUTH_CALLBACK_URL: $(httpScheme)://applicationhub.${domain}${BASE_URL}hub/oauth_callback
         OAUTH2_USERDATA_URL: $(httpScheme)://keycloak.${domain}/realms/master/protocol/openid-connect/userinfo
         OAUTH2_TOKEN_URL: $(httpScheme)://keycloak.${domain}/realms/master/protocol/openid-connect/token
         OAUTH2_AUTHORIZE_URL: $(httpScheme)://keycloak.${domain}/realms/master/protocol/openid-connect/auth
-        OAUTH_LOGOUT_REDIRECT_URL: "$(httpScheme)://applicationhub.${domain}"
+        OAUTH_LOGOUT_REDIRECT_URL: "$(httpScheme)://applicationhub.${domain}${BASE_URL}hub/home"
         OAUTH2_USERNAME_KEY: "preferred_username"
         APP_HUB_NAMESPACE: "${NAMESPACE}"
         STORAGE_CLASS: "${APPLICATION_HUB_STORAGE}"
         RESOURCE_MANAGER_WORKSPACE_PREFIX: "ws"
+        BASE_URL: ${BASE_URL}
 
         JUPYTERHUB_CRYPT_KEY:
           valueFrom:
diff --git a/docs/index.md b/docs/index.md
index a7aaf40e..08ffe659 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -8,6 +8,7 @@
     
     * **[FIX]** Update Application Hub to chart version `2.0.58` to fix hard-coded namespace `proc`<br>
       _Namespace can now be set via chart environment variable `APP_HUB_NAMESPACE`_
+    * **[FIX]** Update Application Hub to chart version `2.0.59` to add support for path-prefix (`BASE_URL`)
     * **[FIX]** Correct default value of `PROCESSING_MAX_RAM` to the integer value in Mi `1024` (was string `8Gi`)
 
 The Deployment Guide captures each release of the EOEPCA Reference Implementation, by providing for each version...