diff options
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/api/v1/user/app.go | 7 | ||||
| -rw-r--r-- | routes/user/setting.go | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/routes/api/v1/user/app.go b/routes/api/v1/user/app.go index 864ede54..dcc3fca5 100644 --- a/routes/api/v1/user/app.go +++ b/routes/api/v1/user/app.go @@ -10,6 +10,7 @@ import ( api "github.com/gogs/go-gogs-client" "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" "github.com/gogs/gogs/pkg/context" ) @@ -33,7 +34,11 @@ func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) Name: form.Name, } if err := models.NewAccessToken(t); err != nil { - c.ServerError("NewAccessToken", err) + if errors.IsAccessTokenNameAlreadyExist(err) { + c.Error(http.StatusUnprocessableEntity, "", err) + } else { + c.ServerError("NewAccessToken", err) + } return } c.JSON(http.StatusCreated, &api.AccessToken{t.Name, t.Sha1}) diff --git a/routes/user/setting.go b/routes/user/setting.go index 2391fb98..e9d8182d 100644 --- a/routes/user/setting.go +++ b/routes/user/setting.go @@ -607,7 +607,12 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { Name: f.Name, } if err := models.NewAccessToken(t); err != nil { - c.ServerError("NewAccessToken", err) + if errors.IsAccessTokenNameAlreadyExist(err) { + c.Flash.Error(c.Tr("settings.token_name_exists")) + c.SubURLRedirect("/user/settings/applications") + } else { + c.ServerError("NewAccessToken", err) + } return } |