优化

internal/service/authentication.go

@@ -2,18 +2,11 @@ package service
 
 import (
 	"context"
-	"time"
 
 	"kra/internal/biz"
-	"kra/internal/conf"
-	"kra/pkg/adminauth"
+	"kra/internal/service/dto"
 )
 
-type UserDisabledError struct{ UserID uint }
-
-func (e *UserDisabledError) Error() string { return biz.ErrUserDisabled.Error() }
-func (e *UserDisabledError) Unwrap() error { return biz.ErrUserDisabled }
-
 type LoginResult struct {
 	User               map[string]any `json:"user"`
 	Token              string         `json:"token"`
@@ -22,65 +15,29 @@ type LoginResult struct {
 }
 
 type AuthService struct {
-	uc       *biz.UserUsecase
-	runtime  *conf.Runtime
-	settings *SecurityService
+	uc *biz.AuthenticationUsecase
 }
 
-func NewAuthService(uc *biz.UserUsecase, runtime *conf.Runtime, settings *SecurityService) *AuthService {
-	return &AuthService{uc: uc, runtime: runtime, settings: settings}
+func NewAuthService(uc *biz.AuthenticationUsecase) *AuthService {
+	return &AuthService{uc: uc}
 }
 
-func (s *AuthService) Login(ctx context.Context, username, password string) (*LoginResult, error) {
-	u, err := s.uc.Login(ctx, username, password)
+func loginResult(value *biz.AuthenticationResult) *LoginResult {
+	return &LoginResult{User: convertUser(value.User), Token: value.Token, ExpiresAt: value.ExpiresAt.UnixMilli(), NeedChangePassword: value.NeedChangePassword}
+}
+
+func (s *AuthService) Login(ctx context.Context, req *dto.LoginRequest, ip, agent string) (*LoginResult, error) {
+	value, err := s.uc.Login(ctx, &biz.LoginAttempt{Username: req.Username, Password: req.Password, CaptchaID: req.CaptchaID, Captcha: req.Captcha, IP: ip, Agent: agent})
 	if err != nil {
 		return nil, err
 	}
-	if u.Enable != 1 {
-		return nil, &UserDisabledError{UserID: u.ID}
-	}
-	if security, securityErr := s.settings.CurrentSecurity(ctx); securityErr == nil && security.PwdExpireEnable && u.PasswordUpdatedAt != nil && time.Since(*u.PasswordUpdatedAt) > time.Duration(security.PwdExpireDays)*24*time.Hour {
-		u.MustChangePassword = true
-	}
-	return s.issueLogin(ctx, u, u.AuthorityID)
-}
-
-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()
-	if config != nil && config.Jwt != nil {
-		secret, issuer = config.Jwt.SigningKey, config.Jwt.Issuer
-		if config.Jwt.ExpiresTime != nil {
-			expires = config.Jwt.ExpiresTime.AsDuration()
-		}
-		if config.Jwt.BufferTime != nil {
-			buffer = config.Jwt.BufferTime.AsDuration()
-		}
-	}
-	token, claims, err := adminauth.Generate(secret, issuer, expires, buffer, user.ID, authorityID, user.UUID, user.Username, user.NickName, user.MustChangePassword)
-	if err != nil {
-		return nil, err
-	}
-	if s.settings.UseMultipoint() {
-		oldToken, cacheErr := s.settings.ActiveToken(ctx, user.Username)
-		if cacheErr != nil {
-			return nil, cacheErr
-		}
-		if cacheErr = s.settings.RotateActiveToken(ctx, user.Username, oldToken, token, expires); cacheErr != nil {
-			return nil, cacheErr
-		}
-	}
-	return &LoginResult{User: convertUser(user), Token: token, ExpiresAt: claims.ExpiresAt.UnixMilli(), NeedChangePassword: user.MustChangePassword}, nil
+	return loginResult(value), 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)
+	value, err := s.uc.SwitchAuthority(ctx, id, authorityID)
 	if err != nil {
 		return nil, err
 	}
-	return s.issueLogin(ctx, user, authorityID)
+	return loginResult(value), nil
 }