diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-04-11 01:25:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 01:25:19 +0800 |
| commit | 62dda96159055ff9d485078f257445b964eb5220 (patch) | |
| tree | a8bd161dc92c368bee0e6b58797e23278565cd8b /internal/route/user/setting.go | |
| parent | 5753d4cb87388c247e91eaf3ce641d309a45e760 (diff) | |
access_token: migrate to GORM and add tests (#6086)
* access_token: migrate to GORM
* Add tests
* Fix tests
* Fix test clock
Diffstat (limited to 'internal/route/user/setting.go')
| -rw-r--r-- | internal/route/user/setting.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go index 63575c9e..7e49505d 100644 --- a/internal/route/user/setting.go +++ b/internal/route/user/setting.go @@ -581,7 +581,7 @@ func SettingsApplications(c *context.Context) { c.Title("settings.applications") c.PageIs("SettingsApplications") - tokens, err := db.ListAccessTokens(c.User.ID) + tokens, err := db.AccessTokens.List(c.User.ID) if err != nil { c.Errorf(err, "list access tokens") return @@ -596,7 +596,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { c.PageIs("SettingsApplications") if c.HasError() { - tokens, err := db.ListAccessTokens(c.User.ID) + tokens, err := db.AccessTokens.List(c.User.ID) if err != nil { c.Errorf(err, "list access tokens") return @@ -607,12 +607,9 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { return } - t := &db.AccessToken{ - UserID: c.User.ID, - Name: f.Name, - } - if err := db.NewAccessToken(t); err != nil { - if errors.IsAccessTokenNameAlreadyExist(err) { + t, err := db.AccessTokens.Create(c.User.ID, f.Name) + if err != nil { + if db.IsErrAccessTokenAlreadyExist(err) { c.Flash.Error(c.Tr("settings.token_name_exists")) c.RedirectSubpath("/user/settings/applications") } else { @@ -627,7 +624,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { } func SettingsDeleteApplication(c *context.Context) { - if err := db.DeleteAccessTokenOfUserByID(c.User.ID, c.QueryInt64("id")); err != nil { + if err := db.AccessTokens.DeleteByID(c.User.ID, c.QueryInt64("id")); err != nil { c.Flash.Error("DeleteAccessTokenByID: " + err.Error()) } else { c.Flash.Success(c.Tr("settings.delete_token_success")) |