Deprecate legacy core datasource token (#14096)
This commit is contained in:
+1
-1
@@ -31,7 +31,7 @@ import { handleException } from 'src/engine/utils/global-exception-handler.util'
|
||||
@UseFilters(AuthRestApiExceptionFilter)
|
||||
export class CloudflareController {
|
||||
constructor(
|
||||
@InjectRepository(Workspace, 'core')
|
||||
@InjectRepository(Workspace)
|
||||
protected readonly workspaceRepository: Repository<Workspace>,
|
||||
private readonly domainManagerService: DomainManagerService,
|
||||
private readonly customDomainService: CustomDomainService,
|
||||
|
||||
+2
-2
@@ -27,7 +27,7 @@ describe('CloudflareController - customHostnameWebhooks', () => {
|
||||
controllers: [CloudflareController],
|
||||
providers: [
|
||||
{
|
||||
provide: getRepositoryToken(Workspace, 'core'),
|
||||
provide: getRepositoryToken(Workspace),
|
||||
useValue: {
|
||||
findOneBy: jest.fn(),
|
||||
save: jest.fn(),
|
||||
@@ -73,7 +73,7 @@ describe('CloudflareController - customHostnameWebhooks', () => {
|
||||
}).compile();
|
||||
|
||||
controller = module.get<CloudflareController>(CloudflareController);
|
||||
WorkspaceRepository = module.get(getRepositoryToken(Workspace, 'core'));
|
||||
WorkspaceRepository = module.get(getRepositoryToken(Workspace));
|
||||
twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
|
||||
domainManagerService =
|
||||
module.get<DomainManagerService>(DomainManagerService);
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ export const CHECK_CUSTOM_DOMAIN_VALID_RECORDS_CRON_PATTERN = '0 * * * *';
|
||||
@Processor(MessageQueue.cronQueue)
|
||||
export class CheckCustomDomainValidRecordsCronJob {
|
||||
constructor(
|
||||
@InjectRepository(Workspace, 'core')
|
||||
@InjectRepository(Workspace)
|
||||
private readonly workspaceRepository: Repository<Workspace>,
|
||||
private readonly customDomainService: CustomDomainService,
|
||||
) {}
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
import { DomainManagerResolver } from 'src/engine/core-modules/domain-manager/domain-manager.resolver';
|
||||
|
||||
@Module({
|
||||
imports: [AuditModule, TypeOrmModule.forFeature([Workspace], 'core')],
|
||||
imports: [AuditModule, TypeOrmModule.forFeature([Workspace])],
|
||||
providers: [
|
||||
DomainManagerResolver,
|
||||
DomainManagerService,
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@ describe('CustomDomainService', () => {
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(Workspace, 'core'),
|
||||
provide: getRepositoryToken(Workspace),
|
||||
useValue: {
|
||||
save: jest.fn(),
|
||||
},
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ export class CustomDomainService {
|
||||
private readonly twentyConfigService: TwentyConfigService,
|
||||
private readonly domainManagerService: DomainManagerService,
|
||||
private readonly auditService: AuditService,
|
||||
@InjectRepository(Workspace, 'core')
|
||||
@InjectRepository(Workspace)
|
||||
private readonly workspaceRepository: Repository<Workspace>,
|
||||
) {
|
||||
if (this.twentyConfigService.get('CLOUDFLARE_API_KEY')) {
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@ describe('DomainManagerService', () => {
|
||||
providers: [
|
||||
DomainManagerService,
|
||||
{
|
||||
provide: getRepositoryToken(Workspace, 'core'),
|
||||
provide: getRepositoryToken(Workspace),
|
||||
useClass: Repository,
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.
|
||||
@Injectable()
|
||||
export class DomainManagerService {
|
||||
constructor(
|
||||
@InjectRepository(Workspace, 'core')
|
||||
@InjectRepository(Workspace)
|
||||
private readonly workspaceRepository: Repository<Workspace>,
|
||||
private readonly twentyConfigService: TwentyConfigService,
|
||||
) {}
|
||||
|
||||
Reference in New Issue
Block a user