From 20b4fe0c59357a433042732d46e38da9c3d14c3b Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 5 Apr 2025 20:26:57 +0800 Subject: database shall no longer be a global variable --- http_auth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'http_auth.go') diff --git a/http_auth.go b/http_auth.go index 03b7e2b..5f0dc66 100644 --- a/http_auth.go +++ b/http_auth.go @@ -9,14 +9,14 @@ import ( // getUserFromRequest returns the user ID and username associated with the // session cookie in a given [http.Request]. -func getUserFromRequest(request *http.Request) (id int, username string, err error) { +func (s *server) getUserFromRequest(request *http.Request) (id int, username string, err error) { var sessionCookie *http.Cookie if sessionCookie, err = request.Cookie("session"); err != nil { return } - err = database.QueryRow( + err = s.database.QueryRow( request.Context(), "SELECT user_id, COALESCE(username, '') FROM users u JOIN sessions s ON u.id = s.user_id WHERE s.session_id = $1;", sessionCookie.Value, -- cgit v1.2.3