diff --git a/pkg/api/authentication.go b/pkg/api/authentication.go index 82ed921bb..ae6fb2952 100644 --- a/pkg/api/authentication.go +++ b/pkg/api/authentication.go @@ -83,12 +83,14 @@ func authenticateHandler() func(http.Handler) http.Handler { return } + prefix := getProxyPrefix(r.Header) + // otherwise redirect to the login page u := url.URL{ - Path: "/login", + Path: prefix + "/login", } q := u.Query() - q.Set(returnURLParam, r.URL.Path) + q.Set(returnURLParam, prefix+r.URL.Path) u.RawQuery = q.Encode() http.Redirect(w, r, u.String(), http.StatusFound) return diff --git a/pkg/api/server.go b/pkg/api/server.go index bd654aa59..58310b4e2 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -147,7 +147,11 @@ func Start(uiBox embed.FS, loginUIBox embed.FS) { r.HandleFunc("/login*", func(w http.ResponseWriter, r *http.Request) { ext := path.Ext(r.URL.Path) if ext == ".html" || ext == "" { - _, _ = w.Write(getLoginPage(loginUIBox)) + prefix := getProxyPrefix(r.Header) + + data := getLoginPage(loginUIBox) + baseURLIndex := strings.Replace(string(data), "%BASE_URL%", prefix+"/", 2) + _, _ = w.Write([]byte(baseURLIndex)) } else { r.URL.Path = strings.Replace(r.URL.Path, loginEndPoint, "", 1) loginRoot, err := fs.Sub(loginUIBox, loginRootDir) @@ -198,11 +202,7 @@ func Start(uiBox embed.FS, loginUIBox embed.FS) { panic(err) } - prefix := "" - if r.Header.Get("X-Forwarded-Prefix") != "" { - prefix = strings.TrimRight(r.Header.Get("X-Forwarded-Prefix"), "/") - } - + prefix := getProxyPrefix(r.Header) baseURLIndex := strings.Replace(string(data), "%BASE_URL%", prefix+"/", 2) baseURLIndex = strings.Replace(baseURLIndex, "base href=\"/\"", fmt.Sprintf("base href=\"%s\"", prefix+"/"), 2) _, _ = w.Write([]byte(baseURLIndex)) @@ -323,10 +323,7 @@ func BaseURLMiddleware(next http.Handler) http.Handler { } else { scheme = "http" } - prefix := "" - if r.Header.Get("X-Forwarded-Prefix") != "" { - prefix = strings.TrimRight(r.Header.Get("X-Forwarded-Prefix"), "/") - } + prefix := getProxyPrefix(r.Header) port := "" forwardedPort := r.Header.Get("X-Forwarded-Port") @@ -347,3 +344,12 @@ func BaseURLMiddleware(next http.Handler) http.Handler { } return http.HandlerFunc(fn) } + +func getProxyPrefix(headers http.Header) string { + prefix := "" + if headers.Get("X-Forwarded-Prefix") != "" { + prefix = strings.TrimRight(headers.Get("X-Forwarded-Prefix"), "/") + } + + return prefix +} diff --git a/ui/login/login.html b/ui/login/login.html index a7c06595d..b23a8b77c 100644 --- a/ui/login/login.html +++ b/ui/login/login.html @@ -1,18 +1,19 @@ + Login - - + +
-
+
@@ -36,4 +37,4 @@
- \ No newline at end of file + diff --git a/ui/v2.5/src/core/createClient.ts b/ui/v2.5/src/core/createClient.ts index 75311e9bb..134417bd8 100644 --- a/ui/v2.5/src/core/createClient.ts +++ b/ui/v2.5/src/core/createClient.ts @@ -131,7 +131,10 @@ export const createClient = () => { // handle unauthorized error by redirecting to the login page if (networkError && (networkError as ServerError).statusCode === 401) { // redirect to login page - const newURL = new URL("/login", window.location.toString()); + const newURL = new URL( + `${window.STASH_BASE_URL}login`, + window.location.toString() + ); newURL.searchParams.append("returnURL", window.location.href); window.location.href = newURL.toString(); }