From 14c78536de7af8c9e4ca1f93d3e49b6fda5a5753 Mon Sep 17 00:00:00 2001 From: William P Date: Mon, 7 Apr 2025 22:18:54 -0400 Subject: [PATCH] use login context with newmessage --- api/api.go | 5 ++++- api/message.go | 15 +++++++++------ api/user.go | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/api/api.go b/api/api.go index ed6a680..55d7963 100644 --- a/api/api.go +++ b/api/api.go @@ -52,7 +52,10 @@ func Start() { r.Delete("/", DeleteMessage) r.Post("/edit", EditMessage) }) - r.Post("/new", NewMessage) + r.Route("/new", func(r chi.Router) { + r.Use(LoginCtx) + r.Post("/", NewMessage) + }) }) r.Route("/users", func(r chi.Router) { diff --git a/api/message.go b/api/message.go index 0b17ad0..5bb07e2 100644 --- a/api/message.go +++ b/api/message.go @@ -115,11 +115,14 @@ func NewMessage(w http.ResponseWriter, r *http.Request) { return } - userID := r.FormValue("user_id") - if userID == "" { - http.Error(w, "Invalid user ID", http.StatusBadRequest) - return - } + // userID := r.FormValue("user_id") + //if userID == "" { + // http.Error(w, "Invalid user ID", http.StatusBadRequest) + // return + //} + + var user = r.Context().Value(userKey{}).(*User) + body := r.FormValue("body") if body == "" { @@ -129,7 +132,7 @@ func NewMessage(w http.ResponseWriter, r *http.Request) { msg := Message{ ID: newMessageID(), - UserID: userID, + UserID: user.ID, Body: body, Timestamp: time.Now(), Edited: time.Time{}, diff --git a/api/user.go b/api/user.go index 63c0086..737c940 100644 --- a/api/user.go +++ b/api/user.go @@ -52,6 +52,7 @@ func LoginCtx(next http.Handler) http.Handler { render.Render(w, r, ErrNotFound) return } + if err != nil { render.Render(w, r, ErrNotFound) return