Proyecto-Titulo/alai-server
3
0
Fork 0
Code Issues Pull Requests Releases Activity

use json instead of form body

Browse Source
This commit is contained in:
Chris Cromer 2023-01-30 09:33:59 -03:00
parent 971d4a28f5
commit ff98ddf6da
Signed by: cromer
GPG Key ID: FA91071797BEEEC2
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
backend/controllers/user.go
View File

@ -17,13 +17,29 @@ func Login(writer http.ResponseWriter, request *http.Request, params httprouter.
gdb := database.Connect() gdb := database.Connect()
defer database.Close(gdb) defer database.Close(gdb)
var receivedUser models.User
var user models.User var user models.User
gdb.Model(models.User{}).Where(&models.User{Username: request.FormValue("username")}).Find(&user) decoder := json.NewDecoder(request.Body)
err := user.CheckPassword(request.FormValue("password")) err := decoder.Decode(&receivedUser)
if (err != nil) {
utils.JSONErrorOutput(writer, http.StatusBadRequest, err.Error())
return
}
result := gdb.Model(models.User{}).Where(&models.User{Username: receivedUser.Username}).Find(&user)
if result.Error != nil {
utils.JSONErrorOutput(writer, http.StatusBadRequest, result.Error.Error())
return
} else if result.RowsAffected == 0 {
utils.JSONErrorOutput(writer, http.StatusBadRequest, errors.New("incorrect user or password").Error())
return
}
err = user.CheckPassword(receivedUser.Password)
if err != nil { if err != nil {
utils.JSONErrorOutput(writer, http.StatusBadRequest, errors.New("incorrect password").Error()) utils.JSONErrorOutput(writer, http.StatusBadRequest, errors.New("incorrect user or password").Error())
return return
} }
@ -94,11 +110,17 @@ func CreateUser(writer http.ResponseWriter, request *http.Request, params httpro
gdb := database.Connect() gdb := database.Connect()
defer database.Close(gdb) defer database.Close(gdb)
user := models.User{ var user models.User
Name: request.FormValue("name"),
Email: request.FormValue("email"), decoder := json.NewDecoder(request.Body)
err := decoder.Decode(&user)
if (err != nil) {
utils.JSONErrorOutput(writer, http.StatusBadRequest, err.Error())
return
} }
user.HashPassword(request.FormValue("password"))
user.HashPassword(user.Password)
result := gdb.Create(&user) result := gdb.Create(&user)
if result.Error != nil { if result.Error != nil {
@ -115,24 +137,23 @@ func UpdateUser(writer http.ResponseWriter, request *http.Request, params httpro
var user models.User var user models.User
userID, _ := strconv.ParseUint(params.ByName("id"), 10, 64) decoder := json.NewDecoder(request.Body)
gdb.Model(models.User{}).Where(&models.User{ID: userID}).Find(&user) err := decoder.Decode(&user)
if (err != nil) {
if request.FormValue("password") != "" { utils.JSONErrorOutput(writer, http.StatusBadRequest, err.Error())
var oldPassword = request.FormValue("old_password")
err := user.CheckPassword(oldPassword)
if err != nil {
utils.JSONErrorOutput(writer, http.StatusBadRequest, errors.New("incorrect password").Error())
return return
} else {
user.HashPassword(request.FormValue("password"))
}
} }
user.Name = request.FormValue("name") user.ID, err = strconv.ParseUint(params.ByName("id"), 10, 64)
user.Email = request.FormValue("email") if (err != nil) {
utils.JSONErrorOutput(writer, http.StatusBadRequest, err.Error())
return
}
if user.Password != "" {
user.HashPassword(user.Password)
}
result := gdb.Updates(&user) result := gdb.Updates(&user)
if result.Error != nil { if result.Error != nil {