From 77ab9f43315a3e82101f75f1692497f0fbf7661b Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Fri, 16 Oct 2020 09:22:24 +0200 Subject: [PATCH] API: Fix short URLs (#28300) * API: Fix short URLs Signed-off-by: Arve Knudsen (cherry picked from commit a2c7c5b912695361c6f5d852df1ed69ec118b233) --- pkg/api/short_url.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/api/short_url.go b/pkg/api/short_url.go index 2108b945d8f..2a2f9413ccb 100644 --- a/pkg/api/short_url.go +++ b/pkg/api/short_url.go @@ -2,6 +2,7 @@ package api import ( "errors" + "fmt" "path" "strings" @@ -27,7 +28,7 @@ func (hs *HTTPServer) createShortURL(c *models.ReqContext, cmd dtos.CreateShortU return Error(500, "Failed to create short URL", err) } - url := path.Join(setting.AppUrl, "goto", shortURL.Uid) + url := fmt.Sprintf("%s/goto/%s", strings.TrimSuffix(setting.AppUrl, "/"), shortURL.Uid) c.Logger.Debug("Created short URL", "url", url) dto := dtos.ShortURL{