From 6799d3f8de0dbd63c2c62fd49e1036e50c79af58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Mon, 22 Aug 2022 15:59:49 +0200 Subject: [PATCH] Fix global value store URL construction with custom paths --- app/boot_levels.go | 3 +-- pkg/options/helpers.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/boot_levels.go b/app/boot_levels.go index 43a780df3..1ee74083d 100644 --- a/app/boot_levels.go +++ b/app/boot_levels.go @@ -759,8 +759,7 @@ func initValuestore(opt *options.Options) { } // Web applications for _, w := range strings.Split(opt.HTTPServer.WebappList, ",") { - w = strings.TrimSpace(w) - webappBaseURLWebapps[w] = webappBaseURL + w + webappBaseURLWebapps[w] = fmt.Sprintf("%s/%s", strings.TrimRight(webappBaseURL, "/"), strings.TrimSpace(w)) } // Webapp related values -- domain, base url (for webapps), ... diff --git a/pkg/options/helpers.go b/pkg/options/helpers.go index 8bdd30c5a..3e8afb300 100644 --- a/pkg/options/helpers.go +++ b/pkg/options/helpers.go @@ -92,11 +92,11 @@ func pathPrefix(pp ...string) string { // will return base URL with domain and prefix path func FullURL(pp ...string) string { - return fullUrl(GuessApiHostname()) + return fullUrl(GuessApiHostname(), pp...) } func FullWebappURL(pp ...string) string { - return fullUrl(GuessWebappHostname()) + return fullUrl(GuessWebappHostname(), pp...) } // will return base URL with domain and prefix path