Implemented retry logic on all transactions
This commit is contained in:
@ -192,47 +192,17 @@ func UpdateUser(db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
tx, err := db.StartTransaction()
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if len(newPass) > 0 || len(newPass2) > 0 {
|
||||
if newPass != newPass2 {
|
||||
tx.RollbackTransaction()
|
||||
userData.Msg = "Die Passwörter stimmen nicht überein."
|
||||
tmpl, err := template.ParseFiles("web/templates/edit-user.html")
|
||||
tmpl = template.Must(tmpl, err)
|
||||
tmpl.ExecuteTemplate(w, "page-content", userData)
|
||||
return
|
||||
}
|
||||
|
||||
if err = tx.ChangePassword(userData.ID, oldPass, newPass); err != nil {
|
||||
log.Println(err)
|
||||
userData.Msg = "Das alte Passwort ist nicht korrekt."
|
||||
tmpl, err := template.ParseFiles("web/templates/edit-user.html")
|
||||
tmpl = template.Must(tmpl, err)
|
||||
tmpl.ExecuteTemplate(w, "page-content", userData)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if err = tx.UpdateAttributes(
|
||||
&model.Attribute{Table: "users", ID: userData.ID, AttName: "username", Value: userData.UserName},
|
||||
&model.Attribute{Table: "users", ID: userData.ID, AttName: "first_name", Value: userData.FirstName},
|
||||
&model.Attribute{Table: "users", ID: userData.ID, AttName: "last_name", Value: userData.LastName},
|
||||
); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err = tx.Commit(); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
if err = db.UpdateUserAttributes(
|
||||
userData.ID,
|
||||
userData.UserName,
|
||||
userData.FirstName,
|
||||
userData.LastName,
|
||||
oldPass,
|
||||
newPass,
|
||||
newPass2); err != nil {
|
||||
userData.Msg = "Aktualisierung der Benutzerdaten fehlgeschlagen."
|
||||
tmpl, err := template.ParseFiles("web/templates/edit-user.html")
|
||||
template.Must(tmpl, err).ExecuteTemplate(w, "page-content", userData)
|
||||
}
|
||||
|
||||
tmpl, err := template.ParseFiles("web/templates/hub.html")
|
||||
|
Reference in New Issue
Block a user