diff --git a/src/assets/login.html b/src/assets/login.html index d22abab..367d1ad 100644 --- a/src/assets/login.html +++ b/src/assets/login.html @@ -22,7 +22,7 @@ } - +
{% if .error %} diff --git a/src/server/auth/middleware.go b/src/server/auth/middleware.go index b559be9..424878f 100644 --- a/src/server/auth/middleware.go +++ b/src/server/auth/middleware.go @@ -6,6 +6,7 @@ import ( "github.com/nkanaev/yarr/src/assets" "github.com/nkanaev/yarr/src/server/router" + "github.com/nkanaev/yarr/src/storage" ) type Middleware struct { @@ -13,6 +14,7 @@ type Middleware struct { Password string BasePath string Public []string + DB *storage.Storage } func unsafeMethod(method string) bool { @@ -46,12 +48,15 @@ func (m *Middleware) Handler(c *router.Context) { c.Redirect(rootUrl) return } else { - c.HTML(http.StatusOK, assets.Template("login.html"), map[string]string{ + c.HTML(http.StatusOK, assets.Template("login.html"), map[string]interface{}{ "username": username, "error": "Invalid username/password", + "settings": m.DB.GetSettings(), }) return } } - c.HTML(http.StatusOK, assets.Template("login.html"), nil) + c.HTML(http.StatusOK, assets.Template("login.html"), map[string]interface{}{ + "settings": m.DB.GetSettings(), + }) } diff --git a/src/server/routes.go b/src/server/routes.go index ee4b6c6..7e0470c 100644 --- a/src/server/routes.go +++ b/src/server/routes.go @@ -35,6 +35,7 @@ func (s *Server) handler() http.Handler { Username: s.Username, Password: s.Password, Public: []string{"/static", "/fever"}, + DB: s.db, } r.Use(a.Handler) }