fix: align admin behavior and Kratos integrations

This commit is contained in:
2026-08-14 14:14:51 +08:00
parent 8c4c6ba661
commit e0b0e1d8c8
123 changed files with 4334 additions and 1877 deletions
+13 -27
View File
@@ -2,7 +2,6 @@ package service
import (
"context"
"errors"
"time"
"kra/internal/biz"
@@ -18,29 +17,20 @@ func tokenDTO(v *biz.APIToken) map[string]any {
}
func (s *SettingsService) CreateAPIToken(ctx context.Context, userID, authorityID uint, days int, remark string) (string, error) {
user, allowed, err := s.Repo().UserHasAuthority(ctx, userID, authorityID)
user, duration, err := s.uc.PrepareAPIToken(ctx, userID, authorityID, days)
if err != nil {
return "", err
}
if !allowed {
return "", errors.New("用户不具备该角色权限")
}
duration := time.Duration(days) * 24 * time.Hour
if days == -1 {
duration = 100 * 365 * 24 * time.Hour
}
if duration <= 0 {
return "", errors.New("有效天数必须大于0或为-1")
}
secret, issuer := "", "kra"
buffer := 24 * time.Hour
if s.config != nil && s.config.Jwt != nil {
secret = s.config.Jwt.SigningKey
if s.config.Jwt.Issuer != "" {
issuer = s.config.Jwt.Issuer
config := s.runtime.Admin()
if config != nil && config.Jwt != nil {
secret = config.Jwt.SigningKey
if config.Jwt.Issuer != "" {
issuer = config.Jwt.Issuer
}
if s.config.Jwt.BufferTime != nil {
buffer = s.config.Jwt.BufferTime.AsDuration()
if config.Jwt.BufferTime != nil {
buffer = config.Jwt.BufferTime.AsDuration()
}
}
token, _, err := adminauth.Generate(secret, issuer, duration, buffer, user.ID, authorityID, user.UUID, user.Username, user.NickName, false)
@@ -48,13 +38,13 @@ func (s *SettingsService) CreateAPIToken(ctx context.Context, userID, authorityI
return "", err
}
record := &biz.APIToken{UserID: userID, AuthorityID: authorityID, Token: token, Status: true, ExpiresAt: time.Now().Add(duration), Remark: remark}
if err = s.Repo().CreateAPIToken(ctx, record); err != nil {
if err = s.uc.CreateAPIToken(ctx, record); err != nil {
return "", err
}
return token, nil
}
func (s *SettingsService) APITokens(ctx context.Context, page, size int, userID uint, status *bool) ([]map[string]any, int64, error) {
items, total, err := s.Repo().ListAPITokens(ctx, page, size, userID, status)
items, total, err := s.uc.ListAPITokens(ctx, page, size, userID, status)
if err != nil {
return nil, 0, err
}
@@ -65,15 +55,11 @@ func (s *SettingsService) APITokens(ctx context.Context, page, size int, userID
return out, total, nil
}
func (s *SettingsService) DisableAPIToken(ctx context.Context, id uint) error {
token, err := s.Repo().DisableAPIToken(ctx, id)
if err != nil {
return err
}
return s.Repo().BlacklistToken(ctx, token)
return s.uc.DisableToken(ctx, id)
}
func (s *SettingsService) BlacklistToken(ctx context.Context, token string) error {
return s.Repo().BlacklistToken(ctx, token)
return s.uc.BlacklistToken(ctx, token)
}
func (s *SettingsService) IsTokenDisabled(ctx context.Context, token string) (bool, error) {
return s.Repo().IsTokenDisabled(ctx, token)
return s.uc.IsTokenDisabled(ctx, token)
}