refactor: unify error handling in routing layer

5 files changed, 31 insertions, 30 deletions

diff --git a/internal/route/api/v1/user/app.go b/internal/route/api/v1/user/app.go
index fdf11c09..99a422cc 100644
--- a/internal/route/api/v1/user/app.go
+++ b/internal/route/api/v1/user/app.go
@@ -17,7 +17,7 @@ import (
 func ListAccessTokens(c *context.APIContext) {
 	tokens, err := db.ListAccessTokens(c.User.ID)
 	if err != nil {
-		c.ServerError("ListAccessTokens", err)
+		c.Error(err, "list access tokens")
 		return
 	}
 
@@ -35,9 +35,9 @@ func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption)
 	}
 	if err := db.NewAccessToken(t); err != nil {
 		if errors.IsAccessTokenNameAlreadyExist(err) {
-			c.Error(http.StatusUnprocessableEntity, "", err)
+			c.ErrorStatus(http.StatusUnprocessableEntity, err)
 		} else {
-			c.ServerError("NewAccessToken", err)
+			c.Error(err, "new access token")
 		}
 		return
 	}
diff --git a/internal/route/api/v1/user/email.go b/internal/route/api/v1/user/email.go
index e211221c..07fd4f8a 100644
--- a/internal/route/api/v1/user/email.go
+++ b/internal/route/api/v1/user/email.go
@@ -5,25 +5,26 @@
 package user
 
 import (
-	convert2 "gogs.io/gogs/internal/route/api/v1/convert"
 	"net/http"
 
 	api "github.com/gogs/go-gogs-client"
+	"github.com/pkg/errors"
 
 	"gogs.io/gogs/internal/conf"
 	"gogs.io/gogs/internal/context"
 	"gogs.io/gogs/internal/db"
+	"gogs.io/gogs/internal/route/api/v1/convert"
 )
 
 func ListEmails(c *context.APIContext) {
 	emails, err := db.GetEmailAddresses(c.User.ID)
 	if err != nil {
-		c.ServerError("GetEmailAddresses", err)
+		c.Error(err, "get email addresses")
 		return
 	}
 	apiEmails := make([]*api.Email, len(emails))
 	for i := range emails {
-		apiEmails[i] = convert2.ToEmail(emails[i])
+		apiEmails[i] = convert.ToEmail(emails[i])
 	}
 	c.JSONSuccess(&apiEmails)
 }
@@ -45,16 +46,16 @@ func AddEmail(c *context.APIContext, form api.CreateEmailOption) {
 
 	if err := db.AddEmailAddresses(emails); err != nil {
 		if db.IsErrEmailAlreadyUsed(err) {
-			c.Error(http.StatusUnprocessableEntity, "", "email address has been used: "+err.(db.ErrEmailAlreadyUsed).Email)
+			c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("email address has been used: "+err.(db.ErrEmailAlreadyUsed).Email))
 		} else {
-			c.Error(http.StatusInternalServerError, "AddEmailAddresses", err)
+			c.Error(err, "add email addresses")
 		}
 		return
 	}
 
 	apiEmails := make([]*api.Email, len(emails))
 	for i := range emails {
-		apiEmails[i] = convert2.ToEmail(emails[i])
+		apiEmails[i] = convert.ToEmail(emails[i])
 	}
 	c.JSON(http.StatusCreated, &apiEmails)
 }
@@ -74,7 +75,7 @@ func DeleteEmail(c *context.APIContext, form api.CreateEmailOption) {
 	}
 
 	if err := db.DeleteEmailAddresses(emails); err != nil {
-		c.Error(http.StatusInternalServerError, "DeleteEmailAddresses", err)
+		c.Error(err, "delete email addresses")
 		return
 	}
 	c.NoContent()
diff --git a/internal/route/api/v1/user/follower.go b/internal/route/api/v1/user/follower.go
index 3a3d0298..c587547b 100644
--- a/internal/route/api/v1/user/follower.go
+++ b/internal/route/api/v1/user/follower.go
@@ -22,7 +22,7 @@ func responseApiUsers(c *context.APIContext, users []*db.User) {
 func listUserFollowers(c *context.APIContext, u *db.User) {
 	users, err := u.GetFollowers(c.QueryInt("page"))
 	if err != nil {
-		c.ServerError("GetUserFollowers", err)
+		c.Error(err, "get followers")
 		return
 	}
 	responseApiUsers(c, users)
@@ -43,7 +43,7 @@ func ListFollowers(c *context.APIContext) {
 func listUserFollowing(c *context.APIContext, u *db.User) {
 	users, err := u.GetFollowing(c.QueryInt("page"))
 	if err != nil {
-		c.ServerError("GetFollowing", err)
+		c.Error(err, "get following")
 		return
 	}
 	responseApiUsers(c, users)
@@ -95,7 +95,7 @@ func Follow(c *context.APIContext) {
 		return
 	}
 	if err := db.FollowUser(c.User.ID, target.ID); err != nil {
-		c.ServerError("FollowUser", err)
+		c.Error(err, "follow user")
 		return
 	}
 	c.NoContent()
@@ -107,7 +107,7 @@ func Unfollow(c *context.APIContext) {
 		return
 	}
 	if err := db.UnfollowUser(c.User.ID, target.ID); err != nil {
-		c.ServerError("UnfollowUser", err)
+		c.Error(err, "unfollow user")
 		return
 	}
 	c.NoContent()
diff --git a/internal/route/api/v1/user/key.go b/internal/route/api/v1/user/key.go
index 759f9008..0d8c4f16 100644
--- a/internal/route/api/v1/user/key.go
+++ b/internal/route/api/v1/user/key.go
@@ -5,21 +5,22 @@
 package user
 
 import (
-	api "github.com/gogs/go-gogs-client"
-	convert2 "gogs.io/gogs/internal/route/api/v1/convert"
-	repo2 "gogs.io/gogs/internal/route/api/v1/repo"
 	"net/http"
 
+	api "github.com/gogs/go-gogs-client"
+	"github.com/pkg/errors"
+
 	"gogs.io/gogs/internal/conf"
 	"gogs.io/gogs/internal/context"
 	"gogs.io/gogs/internal/db"
-	"gogs.io/gogs/internal/db/errors"
+	"gogs.io/gogs/internal/route/api/v1/convert"
+	"gogs.io/gogs/internal/route/api/v1/repo"
 )
 
 func GetUserByParamsName(c *context.APIContext, name string) *db.User {
 	user, err := db.GetUserByName(c.Params(name))
 	if err != nil {
-		c.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
+		c.NotFoundOrError(err, "get user by name")
 		return nil
 	}
 	return user
@@ -37,14 +38,14 @@ func composePublicKeysAPILink() string {
 func listPublicKeys(c *context.APIContext, uid int64) {
 	keys, err := db.ListPublicKeys(uid)
 	if err != nil {
-		c.ServerError("ListPublicKeys", err)
+		c.Error(err, "list public keys")
 		return
 	}
 
 	apiLink := composePublicKeysAPILink()
 	apiKeys := make([]*api.PublicKey, len(keys))
 	for i := range keys {
-		apiKeys[i] = convert2.ToPublicKey(apiLink, keys[i])
+		apiKeys[i] = convert.ToPublicKey(apiLink, keys[i])
 	}
 
 	c.JSONSuccess(&apiKeys)
@@ -65,29 +66,29 @@ func ListPublicKeys(c *context.APIContext) {
 func GetPublicKey(c *context.APIContext) {
 	key, err := db.GetPublicKeyByID(c.ParamsInt64(":id"))
 	if err != nil {
-		c.NotFoundOrServerError("GetPublicKeyByID", db.IsErrKeyNotExist, err)
+		c.NotFoundOrError(err, "get public key by ID")
 		return
 	}
 
 	apiLink := composePublicKeysAPILink()
-	c.JSONSuccess(convert2.ToPublicKey(apiLink, key))
+	c.JSONSuccess(convert.ToPublicKey(apiLink, key))
 }
 
 // CreateUserPublicKey creates new public key to given user by ID.
 func CreateUserPublicKey(c *context.APIContext, form api.CreateKeyOption, uid int64) {
 	content, err := db.CheckPublicKeyString(form.Key)
 	if err != nil {
-		repo2.HandleCheckKeyStringError(c, err)
+		repo.HandleCheckKeyStringError(c, err)
 		return
 	}
 
 	key, err := db.AddPublicKey(uid, form.Title, content)
 	if err != nil {
-		repo2.HandleAddKeyError(c, err)
+		repo.HandleAddKeyError(c, err)
 		return
 	}
 	apiLink := composePublicKeysAPILink()
-	c.JSON(http.StatusCreated, convert2.ToPublicKey(apiLink, key))
+	c.JSON(http.StatusCreated, convert.ToPublicKey(apiLink, key))
 }
 
 func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) {
@@ -97,9 +98,9 @@ func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) {
 func DeletePublicKey(c *context.APIContext) {
 	if err := db.DeletePublicKey(c.User, c.ParamsInt64(":id")); err != nil {
 		if db.IsErrKeyAccessDenied(err) {
-			c.Error(http.StatusForbidden, "", "you do not have access to this key")
+			c.ErrorStatus(http.StatusForbidden, errors.New("You do not have access to this key."))
 		} else {
-			c.Error(http.StatusInternalServerError, "DeletePublicKey", err)
+			c.Error(err, "delete public key")
 		}
 		return
 	}
diff --git a/internal/route/api/v1/user/user.go b/internal/route/api/v1/user/user.go
index 8da3b734..695d5311 100644
--- a/internal/route/api/v1/user/user.go
+++ b/internal/route/api/v1/user/user.go
@@ -13,7 +13,6 @@ import (
 
 	"gogs.io/gogs/internal/context"
 	"gogs.io/gogs/internal/db"
-	"gogs.io/gogs/internal/db/errors"
 	"gogs.io/gogs/internal/markup"
 )
 
@@ -58,7 +57,7 @@ func Search(c *context.APIContext) {
 func GetInfo(c *context.APIContext) {
 	u, err := db.GetUserByName(c.Params(":username"))
 	if err != nil {
-		c.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
+		c.NotFoundOrError(err, "get user by name")
 		return
 	}