fix: align admin behavior and Kratos integrations

internal/data/api_token.go

@@ -58,12 +58,6 @@ func (r *settingsRepo) CreateAPIToken(ctx context.Context, v *biz.APIToken) erro
 	return nil
 }
 func (r *settingsRepo) ListAPITokens(ctx context.Context, page, size int, userID uint, status *bool) ([]*biz.APIToken, int64, error) {
-	if page < 1 {
-		page = 1
-	}
-	if size < 1 {
-		size = 10
-	}
 	db := r.data.gormDB.WithContext(ctx).Model(&apiTokenPO{})
 	if userID != 0 {
 		db = db.Where("user_id = ?", userID)
@@ -76,16 +70,26 @@ func (r *settingsRepo) ListAPITokens(ctx context.Context, page, size int, userID
 		return nil, 0, err
 	}
 	var pos []apiTokenPO
-	if err := db.Order("created_at desc").Offset((page - 1) * size).Limit(size).Find(&pos).Error; err != nil {
+	if err := applyPagination(db.Order("created_at desc"), page, size, 100).Find(&pos).Error; err != nil {
 		return nil, 0, err
 	}
+	userIDs := make([]uint, 0, len(pos))
+	for _, po := range pos {
+		userIDs = append(userIDs, po.UserID)
+	}
+	var userPOs []userPO
+	if len(userIDs) > 0 {
+		if err := r.data.gormDB.WithContext(ctx).Where("id IN ?", userIDs).Find(&userPOs).Error; err != nil {
+			return nil, 0, err
+		}
+	}
+	users := make(map[uint]*biz.User, len(userPOs))
+	for i := range userPOs {
+		users[userPOs[i].ID] = baseBizUser(&userPOs[i])
+	}
 	out := make([]*biz.APIToken, 0, len(pos))
 	for _, po := range pos {
-		v := &biz.APIToken{ID: po.ID, CreatedAt: po.CreatedAt, UpdatedAt: po.UpdatedAt, UserID: po.UserID, AuthorityID: po.AuthorityID, Token: po.Token, Status: po.Status, ExpiresAt: po.ExpiresAt, Remark: po.Remark}
-		var userPO userPO
-		if r.data.gormDB.WithContext(ctx).First(&userPO, po.UserID).Error == nil {
-			v.User, _ = (&systemRepo{data: r.data}).toBizUser(ctx, &userPO)
-		}
+		v := &biz.APIToken{ID: po.ID, CreatedAt: po.CreatedAt, UpdatedAt: po.UpdatedAt, UserID: po.UserID, AuthorityID: po.AuthorityID, Token: po.Token, Status: po.Status, ExpiresAt: po.ExpiresAt, Remark: po.Remark, User: users[po.UserID]}
 		out = append(out, v)
 	}
 	return out, total, nil
@@ -97,6 +101,19 @@ func (r *settingsRepo) DisableAPIToken(ctx context.Context, id uint) (string, er
 	}
 	return po.Token, r.data.gormDB.WithContext(ctx).Model(&po).Update("status", false).Error
 }
+func (r *settingsRepo) DisableAndBlacklistAPIToken(ctx context.Context, id uint) error {
+	return r.data.gormDB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		var po apiTokenPO
+		if err := tx.First(&po, id).Error; err != nil {
+			return err
+		}
+		// Blacklist the token before disabling it while making both writes atomic.
+		if err := tx.Create(&jwtBlacklistPO{JWT: po.Token}).Error; err != nil {
+			return err
+		}
+		return tx.Model(&po).Update("status", false).Error
+	})
+}
 func (r *settingsRepo) BlacklistToken(ctx context.Context, token string) error {
 	if token == "" {
 		return errors.New("token is empty")