website: fix login middleware failing due to wrong HTTP method

R-a-dio · Jan 28, 2024 · 904d1ea · 904d1ea
1 parent 940979c
commit 904d1ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/website/admin/router.go b/website/admin/router.go
@@ -28,12 +28,12 @@ func Router(ctx context.Context, s State) chi.Router {
 
 	r.Group(func(r chi.Router) {
 		r.Use(s.Authentication.LoginMiddleware)
-		r.Get("/", s.GetHome)
+		r.HandleFunc("/", s.GetHome)
 		r.Get("/profile", s.GetProfile)
 		r.Post("/profile", s.PostProfile)
-		r.Get("/pending", s.GetPending)
-		r.Get("/streamer/start", s.StartStreamer)
-		r.Get("/streamer/stop", s.StopStreamer)
+		r.HandleFunc("/pending", s.GetPending)
+		r.HandleFunc("/streamer/start", s.StartStreamer)
+		r.HandleFunc("/streamer/stop", s.StopStreamer)
 	})
 
 	return r

diff --git a/website/middleware/authentication.go b/website/middleware/authentication.go
@@ -64,7 +64,7 @@ func (a authentication) UserMiddleware(next http.Handler) http.Handler {
 
 		// no known username
 		if username == "" {
-			next.ServeHTTP(w, r)
+			next.ServeHTTP(w, RequestWithUser(r, nil))
 			return
 		}
 
@@ -331,8 +331,6 @@ func UserFromContext(ctx context.Context) *radio.User {
 	u, ok := ctx.Value(userContextKey).(*radio.User)
 	if !ok {
 		panic("UserFromContext: called from handler not behind LoginMiddleware")
-	} else if u == nil {
-		panic("UserFromContext: someone stored a nil user")
 	}
 	return u
 }

diff --git a/website/public/state.go b/website/public/state.go
@@ -39,7 +39,6 @@ type shared struct {
 
 func Router(ctx context.Context, s State) chi.Router {
 	r := chi.NewRouter()
-	r.Use(middleware.ThemeCtx(s.Storage))
 
 	r.Get("/", s.GetHome)
 	r.Get("/news", s.GetNews)