houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename core-module environment to twenty-config (#11445)

Browse Source 
closes https://github.com/twentyhq/core-team-issues/issues/759
This commit is contained in:
nitin
2025-04-09 17:41:26 +05:30
committed by GitHub
parent fe6d0241a8
commit bd3ec6d5e3
193 changed files with 1454 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/core-modules/sso/services/sso.service.spec.ts
+4 -4
View File
@@ -3,12 +3,12 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';
import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
import { WorkspaceSSOIdentityProvider } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';
import { SSOException } from 'src/engine/core-modules/sso/sso.exception';
import { WorkspaceSSOIdentityProvider } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
describe('SSOService', () => {
let service: SSOService;
@@ -30,7 +30,7 @@ describe('SSOService', () => {
},
},
{
provide: EnvironmentService,
provide: TwentyConfigService,
useValue: {
get: jest.fn(),
},
packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts
+7 -5
View File
@@ -8,7 +8,7 @@ import { Repository } from 'typeorm';
import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
import {
SSOException,
SSOExceptionCode,
@@ -23,7 +23,7 @@ import {
OIDCResponseType,
WorkspaceSSOIdentityProvider,
} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
@Injectable()
export class SSOService {
@@ -31,7 +31,7 @@ export class SSOService {
constructor(
@InjectRepository(WorkspaceSSOIdentityProvider, 'core')
private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProvider>,
private readonly environmentService: EnvironmentService,
private readonly twentyConfigService: TwentyConfigService,
private readonly billingService: BillingService,
private readonly exceptionHandlerService: ExceptionHandlerService,
) {}
@@ -139,7 +139,7 @@ export class SSOService {
buildCallbackUrl(
identityProvider: Pick<WorkspaceSSOIdentityProvider, 'type' | 'id'>,
) {
const callbackURL = new URL(this.environmentService.get('SERVER_URL'));
const callbackURL = new URL(this.twentyConfigService.get('SERVER_URL'));
callbackURL.pathname = `/auth/${identityProvider.type.toLowerCase()}/callback`;
@@ -154,7 +154,9 @@ export class SSOService {
identityProvider: Pick<WorkspaceSSOIdentityProvider, 'id' | 'type'>,
searchParams?: Record<string, string | boolean>,
) {
const authorizationUrl = new URL(this.environmentService.get('SERVER_URL'));
const authorizationUrl = new URL(
this.twentyConfigService.get('SERVER_URL'),
);
authorizationUrl.pathname = `/auth/${identityProvider.type.toLowerCase()}/login/${identityProvider.id}`;