mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix UI loading redirections. Should fix #906

Browse source
This commit is contained in:
Deluan 2021-03-29 20:13:04 -04:00
parent 404253a881
commit 3b0defefec
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/app/serve_index.go
View file

@ -6,6 +6,7 @@ import (
"io/fs" "io/fs"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"path"
"strings" "strings"
"github.com/microcosm-cc/bluemonday" "github.com/microcosm-cc/bluemonday"
@ -19,6 +20,11 @@ import (
func serveIndex(ds model.DataStore, fs fs.FS) http.HandlerFunc { func serveIndex(ds model.DataStore, fs fs.FS) http.HandlerFunc {
policy := bluemonday.UGCPolicy() policy := bluemonday.UGCPolicy()
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
base := path.Join(conf.Server.BaseURL, consts.URLPathUI)
if r.URL.Path == base {
http.Redirect(w, r, base+"/", 302)
}
c, err := ds.User(r.Context()).CountAll() c, err := ds.User(r.Context()).CountAll()
firstTime := c == 0 && err == nil firstTime := c == 0 && err == nil

10
server/app/serve_index_test.go
View file

@ -26,6 +26,16 @@ var _ = Describe("serveIndex", func() {
conf.Server.UILoginBackgroundURL = "" conf.Server.UILoginBackgroundURL = ""
}) })
It("redirects bare /app path to /app/", func() {
r := httptest.NewRequest("GET", "/app", nil)
w := httptest.NewRecorder()
serveIndex(ds, fs)(w, r)
Expect(w.Code).To(Equal(302))
Expect(w.Header().Get("Location")).To(Equal("/app/"))
})
It("adds app_config to index.html", func() { It("adds app_config to index.html", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()

2
server/server.go
View file

@ -61,7 +61,7 @@ func (a *Server) initRoutes() {
r.Use(requestLogger) r.Use(requestLogger)
r.Use(robotsTXT(ui.Assets())) r.Use(robotsTXT(ui.Assets()))
indexHtml := path.Join(conf.Server.BaseURL, consts.URLPathUI, "index.html") indexHtml := path.Join(conf.Server.BaseURL, consts.URLPathUI)
r.Get("/*", func(w http.ResponseWriter, r *http.Request) { r.Get("/*", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, indexHtml, 302) http.Redirect(w, r, indexHtml, 302)
}) })