提交 v1.3.0 beta

server/service/access_token.go

@@ -3,8 +3,9 @@ package service
 import (
 	"context"
 	"errors"
+	"next-terminal/server/common/nt"
 
-	"next-terminal/server/constant"
+	"next-terminal/server/common"
 	"next-terminal/server/dto"
 	"next-terminal/server/env"
 	"next-terminal/server/global/cache"
@@ -15,6 +16,8 @@ import (
 	"gorm.io/gorm"
 )
 
+var AccessTokenService = new(accessTokenService)
+
 type accessTokenService struct {
 	baseService
 }
@@ -22,33 +25,28 @@ type accessTokenService struct {
 func (service accessTokenService) GenAccessToken(userId string) error {
 	return env.GetDB().Transaction(func(tx *gorm.DB) error {
 		ctx := service.Context(tx)
+
+		if err := service.DelAccessToken(ctx, userId); err != nil {
+			return err
+		}
+
 		user, err := repository.UserRepository.FindById(ctx, userId)
 		if err != nil {
 			return err
 		}
-		oldAccessToken, err := repository.AccessTokenRepository.FindByUserId(ctx, userId)
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return err
-		}
-		if oldAccessToken.Token != "" {
-			cache.TokenManager.Delete(oldAccessToken.Token)
-		}
-		if err := repository.AccessTokenRepository.DeleteByUserId(ctx, userId); err != nil {
-			return err
-		}
 
 		token := "forever-" + utils.UUID()
 		accessToken := &model.AccessToken{
 			ID:      utils.UUID(),
 			UserId:  userId,
 			Token:   token,
-			Created: utils.NowJsonTime(),
+			Created: common.NowJsonTime(),
 		}
 
 		authorization := dto.Authorization{
 			Token:    token,
 			Remember: false,
-			Type:     constant.AccessToken,
+			Type:     nt.AccessToken,
 			User:     &user,
 		}
 
@@ -71,7 +69,7 @@ func (service accessTokenService) Reload() error {
 		authorization := dto.Authorization{
 			Token:    accessToken.Token,
 			Remember: false,
-			Type:     constant.AccessToken,
+			Type:     nt.AccessToken,
 			User:     &user,
 		}
 
@@ -79,3 +77,14 @@ func (service accessTokenService) Reload() error {
 	}
 	return nil
 }
+
+func (service accessTokenService) DelAccessToken(ctx context.Context, userId string) error {
+	oldAccessToken, err := repository.AccessTokenRepository.FindByUserId(ctx, userId)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return err
+	}
+	if oldAccessToken.Token != "" {
+		cache.TokenManager.Delete(oldAccessToken.Token)
+	}
+	return repository.AccessTokenRepository.DeleteByUserId(ctx, userId)
+}