API: Fix short URLs (#28300)

* API: Fix short URLs Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

API: Fix short URLs (#28300)
* API: Fix short URLs Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
a2c7c5b9 · Arve Knudsen · GitHub · c9cc82ea · a2c7c5b9
Commit a2c7c5b9 authored Oct 16, 2020 by Arve Knudsen Committed by GitHub Oct 16, 2020
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

pkg/api/short_url.go
+2 -1

No files found.
--- 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{