diff --git a/auth/auth0/handlers.go b/auth/auth0/handlers.go index af6b188..6b497ea 100644 --- a/auth/auth0/handlers.go +++ b/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.log.Error("unable to store state in session", "error", err) - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } + deps.sessions.Put(r.Context(), StateKey, state) 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.log.Error("unable to remove user from session", "error", err) - } - - if err := deps.sessions.Put(r.Context(), StateKey, nil); err != nil { - deps.log.Error("unable to remove state from session", "error", err) - } + deps.sessions.Put(r.Context(), "user", nil) + deps.sessions.Put(r.Context(), StateKey, nil) 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.log.Error("unable to remove state from session", "error", err) - } + deps.sessions.Put(r.Context(), StateKey, nil) 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.log.Error("unable to store user profile in session", "error", err) - 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 - } + deps.sessions.Put(r.Context(), "user", profile) + deps.sessions.Put(r.Context(), "access_token", token.AccessToken) http.Redirect(w, r, "/", http.StatusFound) } diff --git a/auth/auth0/handlers_test.go b/auth/auth0/handlers_test.go index 9860148..a711635 100644 --- a/auth/auth0/handlers_test.go +++ b/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) { diff --git a/auth/auth0/middleware.go b/auth/auth0/middleware.go index 9cf476e..1cde349 100644 --- a/auth/auth0/middleware.go +++ b/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.log.Error("unable to store state in session", "error", err) - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } + deps.sessions.Put(r.Context(), StateKey, state) loginURL := deps.auth.AuthCodeURL(state) http.Redirect(w, r, loginURL, http.StatusFound)