From 62dda96159055ff9d485078f257445b964eb5220 Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sat, 11 Apr 2020 01:25:19 +0800 Subject: access_token: migrate to GORM and add tests (#6086) * access_token: migrate to GORM * Add tests * Fix tests * Fix test clock --- internal/route/api/v1/user/app.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'internal/route/api') diff --git a/internal/route/api/v1/user/app.go b/internal/route/api/v1/user/app.go index 98532ae2..5afa34fb 100644 --- a/internal/route/api/v1/user/app.go +++ b/internal/route/api/v1/user/app.go @@ -11,11 +11,10 @@ import ( "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/db/errors" ) func ListAccessTokens(c *context.APIContext) { - tokens, err := db.ListAccessTokens(c.User.ID) + tokens, err := db.AccessTokens.List(c.User.ID) if err != nil { c.Error(err, "list access tokens") return @@ -29,12 +28,9 @@ func ListAccessTokens(c *context.APIContext) { } func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) { - t := &db.AccessToken{ - UserID: c.User.ID, - Name: form.Name, - } - if err := db.NewAccessToken(t); err != nil { - if errors.IsAccessTokenNameAlreadyExist(err) { + t, err := db.AccessTokens.Create(c.User.ID, form.Name) + if err != nil { + if db.IsErrAccessTokenAlreadyExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "new access token") -- cgit v1.2.3