access_token: migrate to GORM and add tests (#6086)

* access_token: migrate to GORM

* Add tests

* Fix tests

* Fix test clock

5 files changed, 10 insertions, 24 deletions

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")
diff --git a/internal/route/lfs/route.go b/internal/route/lfs/route.go
index 16478803..a5c25303 100644
--- a/internal/route/lfs/route.go
+++ b/internal/route/lfs/route.go
@@ -7,7 +7,6 @@ package lfs
 import (
 	"net/http"
 	"strings"
-	"time"
 
 	"gopkg.in/macaron.v1"
 	log "unknwon.dev/clog/v2"
@@ -83,7 +82,6 @@ func authenticate() macaron.Handler {
 				}
 				return
 			}
-			token.Updated = time.Now()
 			if err = db.AccessTokens.Save(token); err != nil {
 				log.Error("Failed to update access token: %v", err)
 			}
diff --git a/internal/route/lfs/route_test.go b/internal/route/lfs/route_test.go
index cd5a4a67..d2a95e36 100644
--- a/internal/route/lfs/route_test.go
+++ b/internal/route/lfs/route_test.go
@@ -11,7 +11,6 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/macaron.v1"
 
@@ -124,9 +123,6 @@ func Test_authenticate(t *testing.T) {
 					return &db.AccessToken{}, nil
 				},
 				MockSave: func(t *db.AccessToken) error {
-					if t.Updated.IsZero() {
-						return errors.New("Updated is zero")
-					}
 					return nil
 				},
 			},
diff --git a/internal/route/repo/http.go b/internal/route/repo/http.go
index 59d7bf23..93a99aef 100644
--- a/internal/route/repo/http.go
+++ b/internal/route/repo/http.go
@@ -140,7 +140,6 @@ func HTTPContexter() macaron.Handler {
 				}
 				return
 			}
-			token.Updated = time.Now()
 			if err = db.AccessTokens.Save(token); err != nil {
 				log.Error("Failed to update access token: %v", err)
 			}
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"))