diff --git a/controllers/userController.go b/controllers/userController.go index 72a87e5..04c3a6e 100644 --- a/controllers/userController.go +++ b/controllers/userController.go @@ -79,7 +79,7 @@ func generateToken() string { return base64.StdEncoding.EncodeToString(b) } -func GetUserByToken(c *gin.Context, token string) (database.User, error) { +func GetUserByToken(token string) (database.User, error) { var tokenObject TokenStruct var err error var user database.User @@ -98,7 +98,7 @@ func EditUser(c *gin.Context, token string, user database.User) { db := database.Connector() validate := validators.Validate response := message.Response{Status: 200} - u, err := GetUserByToken(c, token) + u, err := GetUserByToken(token) if err != nil { response.Status = 401 response.Error = gin.H{ @@ -135,15 +135,37 @@ func EditUser(c *gin.Context, token string, user database.User) { message.SendResponse(c, response) return } + + response.Message = gin.H{ + "message": "User successfully updated", + } + message.SendResponse(c, response) } func DeleteUser(c *gin.Context, token string) { - u, err := GetUserByToken(db, token) + db := database.Connector() + u, err := GetUserByToken(token) + response := message.Response{Status: 200} if err != nil { + response.Status = 401 + response.Error = gin.H{ + "error": "Token is invalid, please login", + } + message.SendResponse(c, response) return } + if err := db.Delete(u).Error; err != nil { + response.Status = 500 + response.Error = gin.H{ + "error": err, + } + message.SendResponse(c, response) return } - return + + response.Message = gin.H{ + "message": "User successfully deleted", + } + message.SendResponse(c, response) }