From a04de87584748c90d3689677521e5ee1906cd51f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 15 Oct 2019 14:36:52 -0700 Subject: models/token: generate bindata and simplify code (#5820) --- models/token.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'models') diff --git a/models/token.go b/models/token.go index b757c7d7..0392ac2e 100644 --- a/models/token.go +++ b/models/token.go @@ -5,7 +5,6 @@ package models import ( - "fmt" "time" "github.com/go-xorm/xorm" @@ -48,16 +47,15 @@ func (t *AccessToken) AfterSet(colName string, _ xorm.Cell) { } } -func isAccessTokenNameExist(uid int64, name string) (bool, error) { - return x.Where("uid=?", uid).And("name=?", name).Get(&AccessToken{}) -} - // NewAccessToken creates new access token. func NewAccessToken(t *AccessToken) error { t.Sha1 = tool.SHA1(gouuid.NewV4().String()) - has, err := isAccessTokenNameExist(t.UID, t.Name) + has, err := x.Get(&AccessToken{ + UID: t.UID, + Name: t.Name, + }) if err != nil { - return fmt.Errorf("IsAccessTokenNameExists: %v", err) + return err } else if has { return errors.AccessTokenNameAlreadyExist{t.Name} } -- cgit v1.2.3