fix middleware

auth/auth0/auth0.go

@@ -19,7 +19,7 @@ type Logger interface {
 
 type SessionManager interface {
 	Get(ctx context.Context, key string) any
-	Put(ctx context.Context, key string, value any) error
+	Put(ctx context.Context, key string, value any)
 }
 
 type Config struct {

auth/auth0/handlers.go

@@ -34,11 +34,7 @@ func HandleLogin(deps *deps) http.HandlerFunc {
 
 		deps.log.Info("generated state", "state", state)
 
-		if err = deps.sessions.Put(r.Context(), StateKey, state); err != nil {
+		deps.sessions.Put(r.Context(), StateKey, state)
-			deps.log.Error("unable to store state in session", "error", err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
 
 		http.Redirect(w, r, deps.auth.AuthCodeURL(state), http.StatusFound)
 	}
@@ -46,13 +42,8 @@ func HandleLogin(deps *deps) http.HandlerFunc {
 
 func HandleLogout(deps *deps) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if err := deps.sessions.Put(r.Context(), "user", nil); err != nil {
+		deps.sessions.Put(r.Context(), "user", nil)
-			deps.log.Error("unable to remove user from session", "error", err)
+		deps.sessions.Put(r.Context(), StateKey, nil)
-		}
-
-		if err := deps.sessions.Put(r.Context(), StateKey, nil); err != nil {
-			deps.log.Error("unable to remove state from session", "error", err)
-		}
 
 		scheme := "http"
 		if r.TLS != nil {
@@ -85,9 +76,7 @@ func HandleCallback(deps *deps) http.HandlerFunc {
 			return
 		}
 
-		if err := deps.sessions.Put(r.Context(), StateKey, nil); err != nil {
+		deps.sessions.Put(r.Context(), StateKey, nil)
-			deps.log.Error("unable to remove state from session", "error", err)
-		}
 
 		token, err := deps.auth.Exchange(r.Context(), r.URL.Query().Get("code"))
 		if err != nil {
@@ -110,17 +99,8 @@ func HandleCallback(deps *deps) http.HandlerFunc {
 			return
 		}
 
-		if err = deps.sessions.Put(r.Context(), "user", profile); err != nil {
+		deps.sessions.Put(r.Context(), "user", profile)
-			deps.log.Error("unable to store user profile in session", "error", err)
+		deps.sessions.Put(r.Context(), "access_token", token.AccessToken)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		if err = deps.sessions.Put(r.Context(), "access_token", token.AccessToken); err != nil {
-			deps.log.Error("unable to store access token in session", "error", err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
 
 		http.Redirect(w, r, "/", http.StatusFound)
 	}

auth/auth0/handlers_test.go

@@ -29,7 +29,7 @@ func (m *mockSessionManager) Get(ctx context.Context, key string) any {
 	return m.store[key]
 }
 
-func (m *mockSessionManager) Put(ctx context.Context, key string, value any) error {
+func (m *mockSessionManager) Put(ctx context.Context, key string, value any) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 	if value == nil {
@@ -37,7 +37,6 @@ func (m *mockSessionManager) Put(ctx context.Context, key string, value any) err
 	} else {
 		m.store[key] = value
 	}
-	return nil
 }
 
 func TestHandleLogic(t *testing.T) {

auth/auth0/middleware.go

@@ -20,11 +20,7 @@ func authenticatedMiddleware(deps *deps, next http.Handler) http.Handler {
 				return
 			}
 
-			if err = deps.sessions.Put(r.Context(), StateKey, state); err != nil {
+			deps.sessions.Put(r.Context(), StateKey, state)
-				deps.log.Error("unable to store state in session", "error", err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
 
 			loginURL := deps.auth.AuthCodeURL(state)
 			http.Redirect(w, r, loginURL, http.StatusFound)

server/options.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"log/slog"
+	"net/http"
 	"time"
 
 	"github.com/go-chi/chi/v5"
@@ -32,3 +33,7 @@ func WithWriteTimeout(d time.Duration) Option {
 func WithIdleTimeout(d time.Duration) Option {
 	return func(server *Server) { server.idleTimeout = d }
 }
+
+func WithMiddleware(mw func(http.Handler) http.Handler) Option {
+	return func(server *Server) { server.Router.Use(mw) }
+}