优化

internal/service/authentication.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"kra/internal/biz"
+	"kra/internal/conf"
 	"kra/pkg/adminauth"
 )
 
@@ -20,20 +21,17 @@ type LoginResult struct {
 	NeedChangePassword bool           `json:"needChangePassword"`
 }
 
-func (s *SystemService) CacheGet(ctx context.Context, key string) (string, bool, error) {
-	return s.uc.CacheGet(ctx, key)
-}
-func (s *SystemService) CacheSet(ctx context.Context, key, value string, expiration time.Duration) error {
-	return s.uc.CacheSet(ctx, key, value, expiration)
-}
-func (s *SystemService) CacheDelete(ctx context.Context, key string) error {
-	return s.uc.CacheDelete(ctx, key)
-}
-func (s *SystemService) CacheIncrement(ctx context.Context, key string, expiration time.Duration) (int64, error) {
-	return s.uc.CacheIncrement(ctx, key, expiration)
+type AuthService struct {
+	uc       *biz.UserUsecase
+	runtime  *conf.Runtime
+	settings *SettingsService
 }
 
-func (s *SystemService) Login(ctx context.Context, username, password string) (*LoginResult, error) {
+func NewAuthService(uc *biz.UserUsecase, runtime *conf.Runtime, settings *SettingsService) *AuthService {
+	return &AuthService{uc: uc, runtime: runtime, settings: settings}
+}
+
+func (s *AuthService) Login(ctx context.Context, username, password string) (*LoginResult, error) {
 	u, err := s.uc.Login(ctx, username, password)
 	if err != nil {
 		return nil, err
@@ -47,7 +45,7 @@ func (s *SystemService) Login(ctx context.Context, username, password string) (*
 	return s.issueLogin(ctx, u, u.AuthorityID)
 }
 
-func (s *SystemService) issueLogin(ctx context.Context, user *biz.User, authorityID uint) (*LoginResult, error) {
+func (s *AuthService) issueLogin(ctx context.Context, user *biz.User, authorityID uint) (*LoginResult, error) {
 	expires, buffer := 7*24*time.Hour, 24*time.Hour
 	secret, issuer := "", "kra"
 	config := s.runtime.Admin()
@@ -65,7 +63,7 @@ func (s *SystemService) issueLogin(ctx context.Context, user *biz.User, authorit
 		return nil, err
 	}
 	if s.settings.UseMultipoint() {
-		oldToken, _, cacheErr := s.settings.cache.Get(ctx, activeTokenKey(user.Username))
+		oldToken, _, cacheErr := s.settings.CacheGet(ctx, activeTokenKey(user.Username))
 		if cacheErr != nil {
 			return nil, cacheErr
 		}
@@ -75,3 +73,14 @@ func (s *SystemService) issueLogin(ctx context.Context, user *biz.User, authorit
 	}
 	return &LoginResult{User: convertUser(user), Token: token, ExpiresAt: claims.ExpiresAt.UnixMilli(), NeedChangePassword: user.MustChangePassword}, nil
 }
+
+func (s *AuthService) SwitchAuthority(ctx context.Context, id, authorityID uint) (*LoginResult, error) {
+	if err := s.uc.SetUserAuthority(ctx, id, authorityID); err != nil {
+		return nil, err
+	}
+	user, err := s.uc.User(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	return s.issueLogin(ctx, user, authorityID)
+}