Arav/dwelling-home
1
0
Fork 0
Code Releases 15 Activity

Fixed Content-Type checking. Get DB as an argument.

Browse Source
This commit is contained in:
Alexander Andreev 2023-05-09 23:37:11 +04:00
parent 6ce598d193
commit 66be82d6b2
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/http/api_handlers.go
View File

@ -11,7 +11,6 @@ import (
"git.arav.su/Arav/justcaptcha/pkg/captcha" "git.arav.su/Arav/justcaptcha/pkg/captcha"
"git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb" "git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb"
"git.arav.su/Arav/justcaptcha/pkg/dwcaptcha" "git.arav.su/Arav/justcaptcha/pkg/dwcaptcha"
gbsqlite "git.arav.su/Arav/justguestbook/database/sqlite"
"git.arav.su/Arav/justguestbook/guestbook" "git.arav.su/Arav/justguestbook/guestbook"
) )
@ -23,12 +22,7 @@ type GuestbookApiHandlers struct {
db guestbook.Guestbook db guestbook.Guestbook
} }
func NewGuestbookApiHandlers(dbPath, owner string, pageSz int64) *GuestbookApiHandlers { func NewGuestbookApiHandlers(owner string, pageSz int64, db guestbook.Guestbook) *GuestbookApiHandlers {
db, err := gbsqlite.New(dbPath)
if err != nil {
panic(err)
}
return &GuestbookApiHandlers{Owner: owner, PageSize: pageSz, db: db} return &GuestbookApiHandlers{Owner: owner, PageSize: pageSz, db: db}
} }
@ -36,7 +30,7 @@ func (h *GuestbookApiHandlers) New(w http.ResponseWriter, r *http.Request) {
var entry *guestbook.Entry var entry *guestbook.Entry
var err error var err error
if r.Header.Get("Content-Type") == "application/x-www-form-urlencoded" { if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
r.ParseForm() r.ParseForm()
if !inmemdb.Solve(captcha.ID(r.FormValue("captcha_id")), captcha.Answer(r.FormValue("captcha_answer"))) { if !inmemdb.Solve(captcha.ID(r.FormValue("captcha_id")), captcha.Answer(r.FormValue("captcha_answer"))) {
@ -72,7 +66,7 @@ func (h *GuestbookApiHandlers) Edit(w http.ResponseWriter, r *http.Request) {
var entry *guestbook.Entry var entry *guestbook.Entry
var err error var err error
if r.Header.Get("Content-Type") == "application/x-www-form-urlencoded" { if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
r.ParseForm() r.ParseForm()
if r.FormValue("name") == "" { if r.FormValue("name") == "" {
@ -112,7 +106,7 @@ func (h *GuestbookApiHandlers) Reply(w http.ResponseWriter, r *http.Request) {
var reply *guestbook.Reply var reply *guestbook.Reply
var err error var err error
if r.Header.Get("Content-Type") == "application/x-www-form-urlencoded" { if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
r.ParseForm() r.ParseForm()
id, _ := strconv.ParseInt(GetURLParam(r, "id"), 10, 64) id, _ := strconv.ParseInt(GetURLParam(r, "id"), 10, 64)
reply, err = guestbook.NewReply(id, r.FormValue("message")) reply, err = guestbook.NewReply(id, r.FormValue("message"))
@ -132,7 +126,7 @@ func (h *GuestbookApiHandlers) EditReply(w http.ResponseWriter, r *http.Request)
var reply *guestbook.Reply var reply *guestbook.Reply
var err error var err error
if r.Header.Get("Content-Type") == "application/x-www-form-urlencoded" { if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
r.ParseForm() r.ParseForm()
id, _ := strconv.ParseInt(GetURLParam(r, "id"), 10, 64) id, _ := strconv.ParseInt(GetURLParam(r, "id"), 10, 64)
reply, err = guestbook.NewReply(id, r.FormValue("message")) reply, err = guestbook.NewReply(id, r.FormValue("message"))