github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-22 11:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use API error helpers and improve response codes (#2366)

Browse Source
This commit is contained in:
qwerty287
2023-09-02 13:31:10 +02:00
committed by GitHub
parent 3bee51dc7a
commit 3e563ef198
25 changed files with 117 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/api/users.go
View File

@@ -40,10 +40,10 @@ import (
func GetUsers(c *gin.Context) {
users, err := store.FromContext(c).GetUserList(session.Pagination(c))
if err != nil {
c.String(500, "Error getting user list. %s", err)
c.String(http.StatusInternalServerError, "Error getting user list. %s", err)
return
}
c.JSON(200, users)
c.JSON(http.StatusOK, users)
}
// GetUser
@@ -59,10 +59,10 @@ func GetUsers(c *gin.Context) {
func GetUser(c *gin.Context) {
user, err := store.FromContext(c).GetUserLogin(c.Param("login"))
if err != nil {
handleDbGetError(c, err)
handleDbError(c, err)
return
}
c.JSON(200, user)
c.JSON(http.StatusOK, user)
}
// PatchUser
@@ -89,7 +89,7 @@ func PatchUser(c *gin.Context) {
user, err := _store.GetUserLogin(c.Param("login"))
if err != nil {
handleDbGetError(c, err)
handleDbError(c, err)
return
}
@@ -149,8 +149,8 @@ func PostUser(c *gin.Context) {
// @Summary Delete a user
// @Description Deletes the given user. Requires admin rights.
// @Router /users/{login} [delete]
// @Produce json
// @Success 200 {object} User
// @Produce plain
// @Success 204
// @Tags Users
// @Param Authorization header string true "Insert your personal access token" default(Bearer <personal access token>)
// @Param login path string true "the user's login name"
@@ -159,12 +159,12 @@ func DeleteUser(c *gin.Context) {
user, err := _store.GetUserLogin(c.Param("login"))
if err != nil {
c.String(404, "Cannot find user. %s", err)
handleDbError(c, err)
return
}
if err = _store.DeleteUser(user); err != nil {
c.String(500, "Error deleting user. %s", err)
handleDbError(c, err)
return
}
c.String(200, "")
c.Status(http.StatusNoContent)
}