Deprecate legacy core datasource token (#14096)
This commit is contained in:
@@ -113,23 +113,23 @@ describe('ApiKeyRoleService', () => {
|
||||
providers: [
|
||||
ApiKeyRoleService,
|
||||
{
|
||||
provide: getRepositoryToken(RoleTargetsEntity, 'core'),
|
||||
provide: getRepositoryToken(RoleTargetsEntity),
|
||||
useValue: mockRoleTargetsRepository,
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(RoleEntity, 'core'),
|
||||
provide: getRepositoryToken(RoleEntity),
|
||||
useValue: mockRoleRepository,
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(Workspace, 'core'),
|
||||
provide: getRepositoryToken(Workspace),
|
||||
useValue: mockWorkspaceRepository,
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(ApiKey, 'core'),
|
||||
provide: getRepositoryToken(ApiKey),
|
||||
useValue: mockApiKeyRepository,
|
||||
},
|
||||
{
|
||||
provide: getDataSourceToken('core'),
|
||||
provide: getDataSourceToken(),
|
||||
useValue: mockDataSource,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -17,15 +17,15 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo
|
||||
@Injectable()
|
||||
export class ApiKeyRoleService {
|
||||
constructor(
|
||||
@InjectRepository(RoleTargetsEntity, 'core')
|
||||
@InjectRepository(RoleTargetsEntity)
|
||||
private readonly roleTargetsRepository: Repository<RoleTargetsEntity>,
|
||||
@InjectRepository(RoleEntity, 'core')
|
||||
@InjectRepository(RoleEntity)
|
||||
private readonly roleRepository: Repository<RoleEntity>,
|
||||
|
||||
@InjectRepository(ApiKey, 'core')
|
||||
@InjectRepository(ApiKey)
|
||||
private readonly apiKeyRepository: Repository<ApiKey>,
|
||||
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
|
||||
@InjectDataSource('core')
|
||||
@InjectDataSource()
|
||||
private readonly dataSource: DataSource,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -19,10 +19,12 @@ import { ApiKeyController } from './controllers/api-key.controller';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature(
|
||||
[ApiKey, RoleTargetsEntity, RoleEntity, Workspace],
|
||||
'core',
|
||||
),
|
||||
TypeOrmModule.forFeature([
|
||||
ApiKey,
|
||||
RoleTargetsEntity,
|
||||
RoleEntity,
|
||||
Workspace,
|
||||
]),
|
||||
JwtModule,
|
||||
TokenModule,
|
||||
WorkspacePermissionsCacheModule,
|
||||
|
||||
@@ -83,7 +83,7 @@ describe('ApiKeyService', () => {
|
||||
providers: [
|
||||
ApiKeyService,
|
||||
{
|
||||
provide: getRepositoryToken(ApiKey, 'core'),
|
||||
provide: getRepositoryToken(ApiKey),
|
||||
useValue: mockApiKeyRepository,
|
||||
},
|
||||
{
|
||||
@@ -91,7 +91,7 @@ describe('ApiKeyService', () => {
|
||||
useValue: mockJwtWrapperService,
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(RoleTargetsEntity, 'core'),
|
||||
provide: getRepositoryToken(RoleTargetsEntity),
|
||||
useValue: mockRoleTargetsRepository,
|
||||
},
|
||||
{
|
||||
@@ -99,7 +99,7 @@ describe('ApiKeyService', () => {
|
||||
useValue: mockApiKeyRoleService,
|
||||
},
|
||||
{
|
||||
provide: getDataSourceToken('core'),
|
||||
provide: getDataSourceToken(),
|
||||
useValue: mockDataSource,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -16,11 +16,11 @@ import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrap
|
||||
@Injectable()
|
||||
export class ApiKeyService {
|
||||
constructor(
|
||||
@InjectRepository(ApiKey, 'core')
|
||||
@InjectRepository(ApiKey)
|
||||
private readonly apiKeyRepository: Repository<ApiKey>,
|
||||
private readonly jwtWrapperService: JwtWrapperService,
|
||||
private readonly apiKeyRoleService: ApiKeyRoleService,
|
||||
@InjectDataSource('core')
|
||||
@InjectDataSource()
|
||||
private readonly dataSource: DataSource,
|
||||
) {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user