000e621eb6
- 新增 PUT /api/v1/admin/api-keys/:id 端点，允许管理员修改任意用户 API Key 的分组绑定 - 跳过用户级权限校验但保留分组有效性验证，修改后触发认证缓存失效 - Service 层支持三态语义：nil=不修改，0=解绑，>0=绑定，<0=拒绝 - 指针值拷贝保证安全隔离，负数 groupID 返回 400 INVALID_GROUP_ID - 前端 UserApiKeysModal 新增可点击的分组选择下拉框，支持多 Key 并发更新 - 下拉支持视口翻转和滚动关闭，按钮有 disabled 和加载状态 - 覆盖：后端 20 个单元测试 (Service 11 + Handler 9) + 前端 16 个 E2E 测试 - golangci-lint 0 issues, make test-unit 全部通过
294 lines
12 KiB
Go
294 lines
12 KiB
Go
//go:build unit
|
||
|
||
package service
|
||
|
||
import (
|
||
"context"
|
||
"errors"
|
||
"testing"
|
||
"time"
|
||
|
||
infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors"
|
||
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
|
||
"github.com/stretchr/testify/require"
|
||
)
|
||
|
||
// ---------------------------------------------------------------------------
|
||
// Stubs
|
||
// ---------------------------------------------------------------------------
|
||
|
||
// apiKeyRepoStubForGroupUpdate implements APIKeyRepository for AdminUpdateAPIKeyGroupID tests.
|
||
type apiKeyRepoStubForGroupUpdate struct {
|
||
key *APIKey
|
||
getErr error
|
||
updateErr error
|
||
updated *APIKey // captures what was passed to Update
|
||
}
|
||
|
||
func (s *apiKeyRepoStubForGroupUpdate) GetByID(_ context.Context, _ int64) (*APIKey, error) {
|
||
if s.getErr != nil {
|
||
return nil, s.getErr
|
||
}
|
||
clone := *s.key
|
||
return &clone, nil
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) Update(_ context.Context, key *APIKey) error {
|
||
if s.updateErr != nil {
|
||
return s.updateErr
|
||
}
|
||
clone := *key
|
||
s.updated = &clone
|
||
return nil
|
||
}
|
||
|
||
// Unused methods – panic on unexpected call.
|
||
func (s *apiKeyRepoStubForGroupUpdate) Create(context.Context, *APIKey) error { panic("unexpected") }
|
||
func (s *apiKeyRepoStubForGroupUpdate) GetKeyAndOwnerID(context.Context, int64) (string, int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) GetByKey(context.Context, string) (*APIKey, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) GetByKeyForAuth(context.Context, string) (*APIKey, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) Delete(context.Context, int64) error { panic("unexpected") }
|
||
func (s *apiKeyRepoStubForGroupUpdate) ListByUserID(context.Context, int64, pagination.PaginationParams) ([]APIKey, *pagination.PaginationResult, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) VerifyOwnership(context.Context, int64, []int64) ([]int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) CountByUserID(context.Context, int64) (int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) ExistsByKey(context.Context, string) (bool, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) ListByGroupID(context.Context, int64, pagination.PaginationParams) ([]APIKey, *pagination.PaginationResult, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) SearchAPIKeys(context.Context, int64, string, int) ([]APIKey, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) ClearGroupIDByGroupID(context.Context, int64) (int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) CountByGroupID(context.Context, int64) (int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) ListKeysByUserID(context.Context, int64) ([]string, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) ListKeysByGroupID(context.Context, int64) ([]string, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) IncrementQuotaUsed(context.Context, int64, float64) (float64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *apiKeyRepoStubForGroupUpdate) UpdateLastUsed(context.Context, int64, time.Time) error {
|
||
panic("unexpected")
|
||
}
|
||
|
||
// groupRepoStubForGroupUpdate implements GroupRepository for AdminUpdateAPIKeyGroupID tests.
|
||
type groupRepoStubForGroupUpdate struct {
|
||
group *Group
|
||
getErr error
|
||
lastGetByIDArg int64
|
||
}
|
||
|
||
func (s *groupRepoStubForGroupUpdate) GetByID(_ context.Context, id int64) (*Group, error) {
|
||
s.lastGetByIDArg = id
|
||
if s.getErr != nil {
|
||
return nil, s.getErr
|
||
}
|
||
return s.group, nil
|
||
}
|
||
|
||
// Unused methods – panic on unexpected call.
|
||
func (s *groupRepoStubForGroupUpdate) Create(context.Context, *Group) error { panic("unexpected") }
|
||
func (s *groupRepoStubForGroupUpdate) GetByIDLite(context.Context, int64) (*Group, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) Update(context.Context, *Group) error { panic("unexpected") }
|
||
func (s *groupRepoStubForGroupUpdate) Delete(context.Context, int64) error { panic("unexpected") }
|
||
func (s *groupRepoStubForGroupUpdate) DeleteCascade(context.Context, int64) ([]int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) List(context.Context, pagination.PaginationParams) ([]Group, *pagination.PaginationResult, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) ListWithFilters(context.Context, pagination.PaginationParams, string, string, string, *bool) ([]Group, *pagination.PaginationResult, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) ListActive(context.Context) ([]Group, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) ListActiveByPlatform(context.Context, string) ([]Group, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) ExistsByName(context.Context, string) (bool, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) GetAccountCount(context.Context, int64) (int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) DeleteAccountGroupsByGroupID(context.Context, int64) (int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) GetAccountIDsByGroupIDs(context.Context, []int64) ([]int64, error) {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) BindAccountsToGroup(context.Context, int64, []int64) error {
|
||
panic("unexpected")
|
||
}
|
||
func (s *groupRepoStubForGroupUpdate) UpdateSortOrders(context.Context, []GroupSortOrderUpdate) error {
|
||
panic("unexpected")
|
||
}
|
||
|
||
// ---------------------------------------------------------------------------
|
||
// Tests
|
||
// ---------------------------------------------------------------------------
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_KeyNotFound(t *testing.T) {
|
||
repo := &apiKeyRepoStubForGroupUpdate{getErr: ErrAPIKeyNotFound}
|
||
svc := &adminServiceImpl{apiKeyRepo: repo}
|
||
|
||
_, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 999, int64Ptr(1))
|
||
require.ErrorIs(t, err, ErrAPIKeyNotFound)
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_NilGroupID_NoOp(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test", GroupID: int64Ptr(5)}
|
||
repo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
svc := &adminServiceImpl{apiKeyRepo: repo}
|
||
|
||
got, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, nil)
|
||
require.NoError(t, err)
|
||
require.Equal(t, int64(1), got.ID)
|
||
// Update should NOT have been called (updated stays nil)
|
||
require.Nil(t, repo.updated)
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_Unbind(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test", GroupID: int64Ptr(5), Group: &Group{ID: 5, Name: "Old"}}
|
||
repo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
cache := &authCacheInvalidatorStub{}
|
||
svc := &adminServiceImpl{apiKeyRepo: repo, authCacheInvalidator: cache}
|
||
|
||
got, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(0))
|
||
require.NoError(t, err)
|
||
require.Nil(t, got.GroupID, "group_id should be nil after unbind")
|
||
require.Nil(t, got.Group, "group object should be nil after unbind")
|
||
require.NotNil(t, repo.updated, "Update should have been called")
|
||
require.Nil(t, repo.updated.GroupID)
|
||
require.Equal(t, []string{"sk-test"}, cache.keys, "cache should be invalidated")
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_BindActiveGroup(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test", GroupID: nil}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
groupRepo := &groupRepoStubForGroupUpdate{group: &Group{ID: 10, Name: "Pro", Status: StatusActive}}
|
||
cache := &authCacheInvalidatorStub{}
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo, groupRepo: groupRepo, authCacheInvalidator: cache}
|
||
|
||
got, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(10))
|
||
require.NoError(t, err)
|
||
require.NotNil(t, got.GroupID)
|
||
require.Equal(t, int64(10), *got.GroupID)
|
||
require.Equal(t, int64(10), *apiKeyRepo.updated.GroupID)
|
||
require.Equal(t, []string{"sk-test"}, cache.keys)
|
||
// M3: verify correct group ID was passed to repo
|
||
require.Equal(t, int64(10), groupRepo.lastGetByIDArg)
|
||
// C1 fix: verify Group object is populated
|
||
require.NotNil(t, got.Group)
|
||
require.Equal(t, "Pro", got.Group.Name)
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_SameGroup_Idempotent(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test", GroupID: int64Ptr(10), Group: &Group{ID: 10, Name: "Pro"}}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
groupRepo := &groupRepoStubForGroupUpdate{group: &Group{ID: 10, Name: "Pro", Status: StatusActive}}
|
||
cache := &authCacheInvalidatorStub{}
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo, groupRepo: groupRepo, authCacheInvalidator: cache}
|
||
|
||
got, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(10))
|
||
require.NoError(t, err)
|
||
require.NotNil(t, got.GroupID)
|
||
require.Equal(t, int64(10), *got.GroupID)
|
||
// Update is still called (current impl doesn't short-circuit on same group)
|
||
require.NotNil(t, apiKeyRepo.updated)
|
||
require.Equal(t, []string{"sk-test"}, cache.keys)
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_GroupNotFound(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test"}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
groupRepo := &groupRepoStubForGroupUpdate{getErr: ErrGroupNotFound}
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo, groupRepo: groupRepo}
|
||
|
||
_, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(99))
|
||
require.ErrorIs(t, err, ErrGroupNotFound)
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_GroupNotActive(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test"}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
groupRepo := &groupRepoStubForGroupUpdate{group: &Group{ID: 5, Status: StatusDisabled}}
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo, groupRepo: groupRepo}
|
||
|
||
_, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(5))
|
||
require.Error(t, err)
|
||
require.Equal(t, "GROUP_NOT_ACTIVE", infraerrors.Reason(err))
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_UpdateFails(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test", GroupID: int64Ptr(3)}
|
||
repo := &apiKeyRepoStubForGroupUpdate{key: existing, updateErr: errors.New("db write error")}
|
||
svc := &adminServiceImpl{apiKeyRepo: repo}
|
||
|
||
_, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(0))
|
||
require.Error(t, err)
|
||
require.Contains(t, err.Error(), "update api key")
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_NegativeGroupID(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test"}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo}
|
||
|
||
_, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(-5))
|
||
require.Error(t, err)
|
||
require.Equal(t, "INVALID_GROUP_ID", infraerrors.Reason(err))
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_PointerIsolation(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test", GroupID: nil}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
groupRepo := &groupRepoStubForGroupUpdate{group: &Group{ID: 10, Name: "Pro", Status: StatusActive}}
|
||
cache := &authCacheInvalidatorStub{}
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo, groupRepo: groupRepo, authCacheInvalidator: cache}
|
||
|
||
inputGID := int64(10)
|
||
got, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, &inputGID)
|
||
require.NoError(t, err)
|
||
require.NotNil(t, got.GroupID)
|
||
// Mutating the input pointer must NOT affect the stored value
|
||
inputGID = 999
|
||
require.Equal(t, int64(10), *got.GroupID)
|
||
require.Equal(t, int64(10), *apiKeyRepo.updated.GroupID)
|
||
}
|
||
|
||
func TestAdminService_AdminUpdateAPIKeyGroupID_NilCacheInvalidator(t *testing.T) {
|
||
existing := &APIKey{ID: 1, Key: "sk-test"}
|
||
apiKeyRepo := &apiKeyRepoStubForGroupUpdate{key: existing}
|
||
groupRepo := &groupRepoStubForGroupUpdate{group: &Group{ID: 7, Status: StatusActive}}
|
||
// authCacheInvalidator is nil – should not panic
|
||
svc := &adminServiceImpl{apiKeyRepo: apiKeyRepo, groupRepo: groupRepo}
|
||
|
||
got, err := svc.AdminUpdateAPIKeyGroupID(context.Background(), 1, int64Ptr(7))
|
||
require.NoError(t, err)
|
||
require.NotNil(t, got.GroupID)
|
||
require.Equal(t, int64(7), *got.GroupID)
|
||
}
|