jason/cpolis
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 58 Wiki Activity

Check if user already exists and bug fix

Browse Source
This commit is contained in:
Jason Streifling
2024-02-24 10:56:12 +01:00
parent 2247f316a3
commit 41113b24a8
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/data/db.go
View File

@@ -44,7 +44,7 @@ func (db *DB) AddUser(user, pass, first, last string, writer, editor, admin bool
INSERT INTO users INSERT INTO users
(username, password, first_name, last_name, writer, editor, admin) (username, password, first_name, last_name, writer, editor, admin)
VALUES VALUES
(?, ?, ?, ?, ?, ?) (?, ?, ?, ?, ?, ?, ?)
` `
_, err = db.Exec(query, user, string(hashedPass), first, last, writer, editor, admin) _, err = db.Exec(query, user, string(hashedPass), first, last, writer, editor, admin)
if err != nil { if err != nil {

13
cmd/ui/ui.go
View File

@@ -59,9 +59,16 @@ func HandleAddUser(db *data.DB) http.HandlerFunc {
_, _, ok := checkUserStrings(user, first, last) _, _, ok := checkUserStrings(user, first, last)
if !ok { if !ok {
log.Println("checkUserStrings")
template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil)
}
id, _ := db.GetID(user)
if id != 0 {
log.Println("GetID")
template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil) template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil)
} }
if pass != pass2 { if pass != pass2 {
log.Println("pass")
template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil) template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil)
} }
switch role { switch role {
@@ -78,10 +85,14 @@ func HandleAddUser(db *data.DB) http.HandlerFunc {
editor = false editor = false
admin = true admin = true
default: default:
log.Println("switch")
template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil) template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil)
} }
db.AddUser(user, pass, first, last, writer, editor, admin) if err := db.AddUser(user, pass, first, last, writer, editor, admin); err != nil {
log.Println(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
}
template.Must(template.ParseFiles("web/templates/editor.html")).Execute(w, nil) template.Must(template.ParseFiles("web/templates/editor.html")).Execute(w, nil)
} }
} }

4
main.go
View File

@@ -30,8 +30,10 @@ func main() {
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
template.Must(template.ParseFiles("web/templates/index.html", "web/templates/login.html")).Execute(w, nil) template.Must(template.ParseFiles("web/templates/index.html", "web/templates/login.html")).Execute(w, nil)
}) })
mux.HandleFunc("POST /login/", ui.HandleLogin(db))
mux.HandleFunc("POST /add-user/", ui.HandleAddUser(db))
mux.HandleFunc("POST /finished-edit/", ui.HandleFinishedEdit(rss)) mux.HandleFunc("POST /finished-edit/", ui.HandleFinishedEdit(rss))
mux.HandleFunc("POST /login/", ui.HandleLogin(db))
log.Fatalln(http.ListenAndServe(":8080", mux)) log.Fatalln(http.ListenAndServe(":8080", mux))
} }

1
web/templates/add-user.html
View File

@@ -1,4 +1,5 @@
{{define "page-content"}} {{define "page-content"}}
<h2>Neuer Benutzer</h2>
<form> <form>
<input name="username" placeholder="Benutzername" type="text" /> <input name="username" placeholder="Benutzername" type="text" />
<input name="password" placeholder="Passwort" type="password" /> <input name="password" placeholder="Passwort" type="password" />