Elgato_dark/twenty
1
0
Fork 0
mirror of https://github.com/twentyhq/twenty synced 2026-04-21 13:37:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

fix: correct sSOService → ssoService camelCase typo (#19845)

Browse source 
## Summary

Fixes the pre-existing camelCase typo mentioned in #19839.

The injected `SSOService` property was named `sSOService` instead of the
correct camelCase `ssoService` across the auth module. This is a
straightforward mechanical rename of the property/variable name — no
logic changes.

> **Bonus: pre-existing typo to fix** — `private sSOService: SSOService`
— The variable name is a camelCase typo (`sSOService` instead of
`ssoService`). — #19839

## Changes

Renamed `sSOService` → `ssoService` in 7 files:
- `auth/guards/oidc-auth.guard.ts`
- `auth/guards/saml-auth.guard.ts`
- `auth/guards/oidc-auth.spec.ts`
- `auth/auth.resolver.ts`
- `auth/controllers/sso-auth.controller.ts`
- `auth/strategies/saml.auth.strategy.ts`
- `sso/sso.resolver.ts`

Note: The type `SSOService` (PascalCase class name) is intentionally
left unchanged — it will be addressed in the broader SSO acronym PR from
#19839.

## Test plan

- [ ] Verify `typecheck twenty-server` passes
- [ ] Verify existing auth/SSO tests pass

Co-authored-by: Abhay <abhayjnayakpro@gmail.com>
This commit is contained in:
Avasis AI 2026-04-19 16:59:06 +05:30 committed by GitHub
parent dbf43d792c
commit 1e27c3b621
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
View file

@ -122,7 +122,7 @@ export class AuthResolver {
private workspaceDomainsService: WorkspaceDomainsService,
private userWorkspaceService: UserWorkspaceService,
private emailVerificationTokenService: EmailVerificationTokenService,
private sSOService: SSOService,
private ssoService: SSOService,
private readonly auditService: AuditService,
private readonly permissionsService: PermissionsService,
) {}
@ -142,7 +142,7 @@ export class AuthResolver {
async getAuthorizationUrlForSSO(
@Args('input') params: GetAuthorizationUrlForSSOInput,
) {
return await this.sSOService.getAuthorizationUrlForSSO(
return await this.ssoService.getAuthorizationUrlForSSO(
params.identityProviderId,
omit(params, ['identityProviderId']),
);

6
packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts
View file

@ -51,7 +51,7 @@ export class SSOAuthController {
private readonly guardRedirectService: GuardRedirectService,
private readonly workspaceDomainsService: WorkspaceDomainsService,
private readonly userService: UserService,
private readonly sSOService: SSOService,
private readonly ssoService: SSOService,
@InjectRepository(WorkspaceSSOIdentityProviderEntity)
private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProviderEntity>,
) {}
@ -66,11 +66,11 @@ export class SSOAuthController {
async generateMetadata(@Req() req: any): Promise<string | void> {
return generateServiceProviderMetadata({
wantAssertionsSigned: true,
issuer: this.sSOService.buildIssuerURL({
issuer: this.ssoService.buildIssuerURL({
id: req.params.identityProviderId,
type: IdentityProviderType.SAML,
}),
callbackUrl: this.sSOService.buildCallbackUrl({
callbackUrl: this.ssoService.buildCallbackUrl({
id: req.params.identityProviderId,
type: IdentityProviderType.SAML,
}),

6
packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.guard.ts
View file

@ -19,7 +19,7 @@ import { type WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules
@Injectable()
export class OIDCAuthGuard extends AuthGuard('openidconnect') {
constructor(
private readonly sSOService: SSOService,
private readonly ssoService: SSOService,
private readonly guardRedirectService: GuardRedirectService,
private readonly workspaceDomainsService: WorkspaceDomainsService,
) {
@ -69,7 +69,7 @@ export class OIDCAuthGuard extends AuthGuard('openidconnect') {
);
}
identityProvider = await this.sSOService.findSSOIdentityProviderById(
identityProvider = await this.ssoService.findSSOIdentityProviderById(
state.identityProviderId,
);
@ -82,7 +82,7 @@ export class OIDCAuthGuard extends AuthGuard('openidconnect') {
const issuer = await Issuer.discover(identityProvider.issuer);
new OIDCAuthStrategy(
this.sSOService.getOIDCClient(identityProvider, issuer),
this.ssoService.getOIDCClient(identityProvider, issuer),
identityProvider.id,
);

14
packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.spec.ts
View file

@ -37,7 +37,7 @@ jest.mock('openid-client', () => ({
describe('OIDCAuthGuard', () => {
let guard: OIDCAuthGuard;
let sSOService: SSOService;
let ssoService: SSOService;
let guardRedirectService: GuardRedirectService;
let mockExecutionContext: ExecutionContext;
@ -70,7 +70,7 @@ describe('OIDCAuthGuard', () => {
}).compile();
guard = module.get<OIDCAuthGuard>(OIDCAuthGuard);
sSOService = module.get<SSOService>(SSOService);
ssoService = module.get<SSOService>(SSOService);
guardRedirectService =
module.get<GuardRedirectService>(GuardRedirectService);
@ -88,7 +88,7 @@ describe('OIDCAuthGuard', () => {
mockExecutionContext = createMockExecutionContext(mockedRequest);
jest.spyOn(sSOService, 'findSSOIdentityProviderById').mockResolvedValue({
jest.spyOn(ssoService, 'findSSOIdentityProviderById').mockResolvedValue({
id: 'test-id',
issuer: 'https://issuer.example.com',
workspace: {},
@ -98,7 +98,7 @@ describe('OIDCAuthGuard', () => {
expect(result).toBe(true);
expect(guardRedirectService.dispatchErrorFromGuard).not.toHaveBeenCalled();
expect(sSOService.findSSOIdentityProviderById).toHaveBeenCalledWith(
expect(ssoService.findSSOIdentityProviderById).toHaveBeenCalledWith(
'test-id',
);
});
@ -111,11 +111,11 @@ describe('OIDCAuthGuard', () => {
mockExecutionContext = createMockExecutionContext(mockedRequest);
jest
.spyOn(sSOService, 'findSSOIdentityProviderById')
.spyOn(ssoService, 'findSSOIdentityProviderById')
.mockResolvedValue(null);
await expect(guard.canActivate(mockExecutionContext)).resolves.toBe(false);
expect(sSOService.findSSOIdentityProviderById).toHaveBeenCalledWith(
expect(ssoService.findSSOIdentityProviderById).toHaveBeenCalledWith(
'non-existent-id',
);
expect(guardRedirectService.dispatchErrorFromGuard).toHaveBeenCalled();
@ -129,7 +129,7 @@ describe('OIDCAuthGuard', () => {
mockExecutionContext = createMockExecutionContext(mockedRequest);
jest
.spyOn(sSOService, 'findSSOIdentityProviderById')
.spyOn(ssoService, 'findSSOIdentityProviderById')
.mockResolvedValue(null);
await expect(guard.canActivate(mockExecutionContext)).resolves.toBe(false);

6
packages/twenty-server/src/engine/core-modules/auth/guards/saml-auth.guard.ts
View file

@ -19,7 +19,7 @@ import { type WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules
@Injectable()
export class SAMLAuthGuard extends AuthGuard('saml') {
constructor(
private readonly sSOService: SSOService,
private readonly ssoService: SSOService,
private readonly guardRedirectService: GuardRedirectService,
private readonly workspaceDomainsService: WorkspaceDomainsService,
) {
@ -34,7 +34,7 @@ export class SAMLAuthGuard extends AuthGuard('saml') {
| null = null;
try {
identityProvider = await this.sSOService.findSSOIdentityProviderById(
identityProvider = await this.ssoService.findSSOIdentityProviderById(
request.params.identityProviderId,
);
@ -44,7 +44,7 @@ export class SAMLAuthGuard extends AuthGuard('saml') {
AuthExceptionCode.INVALID_DATA,
);
}
new SamlAuthStrategy(this.sSOService);
new SamlAuthStrategy(this.ssoService);
return (await super.canActivate(context)) as boolean;
} catch (err) {

10
packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.ts
View file

@ -36,16 +36,16 @@ export class SamlAuthStrategy extends PassportStrategy(
MultiSamlStrategy,
'saml',
) {
constructor(private readonly sSOService: SSOService) {
constructor(private readonly ssoService: SSOService) {
super(
{
getSamlOptions: (req, callback) => {
this.sSOService
this.ssoService
.findSSOIdentityProviderById(req.params.identityProviderId)
.then((identityProvider) => {
if (
identityProvider &&
this.sSOService.isSAMLIdentityProvider(identityProvider)
this.ssoService.isSAMLIdentityProvider(identityProvider)
) {
// IdP metadata XML typically has whitespace-formatted certificates
const sanitizedCertificate =
@ -53,9 +53,9 @@ export class SamlAuthStrategy extends PassportStrategy(
const config: SamlConfig = {
entryPoint: identityProvider.ssoURL,
issuer: this.sSOService.buildIssuerURL(identityProvider),
issuer: this.ssoService.buildIssuerURL(identityProvider),
callbackUrl:
this.sSOService.buildCallbackUrl(identityProvider),
this.ssoService.buildCallbackUrl(identityProvider),
idpCert: sanitizedCertificate,
wantAssertionsSigned: true,
wantAuthnResponseSigned: false,

12
packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts
View file

@ -35,7 +35,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
@UsePipes(ResolverValidationPipe)
@UseGuards(SettingsPermissionGuard(PermissionFlagType.SECURITY))
export class SSOResolver {
constructor(private readonly sSOService: SSOService) {}
constructor(private readonly ssoService: SSOService) {}
@UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@Mutation(() => SetupSsoDTO)
@ -43,7 +43,7 @@ export class SSOResolver {
@Args('input') setupSsoInput: SetupOIDCSsoInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
): Promise<SetupSsoDTO | SSOException> {
return this.sSOService.createOIDCIdentityProvider(
return this.ssoService.createOIDCIdentityProvider(
setupSsoInput,
workspaceId,
);
@ -54,7 +54,7 @@ export class SSOResolver {
async getSSOIdentityProviders(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
) {
return this.sSOService.getSSOIdentityProviders(workspaceId);
return this.ssoService.getSSOIdentityProviders(workspaceId);
}
@UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@ -63,7 +63,7 @@ export class SSOResolver {
@Args('input') setupSsoInput: SetupSAMLSsoInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
): Promise<SetupSsoDTO | SSOException> {
return this.sSOService.createSAMLIdentityProvider(
return this.ssoService.createSAMLIdentityProvider(
setupSsoInput,
workspaceId,
);
@ -75,7 +75,7 @@ export class SSOResolver {
@Args('input') { identityProviderId }: DeleteSsoInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
) {
return this.sSOService.deleteSSOIdentityProvider(
return this.ssoService.deleteSSOIdentityProvider(
identityProviderId,
workspaceId,
);
@ -87,6 +87,6 @@ export class SSOResolver {
@Args('input') input: EditSsoInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
) {
return this.sSOService.editSSOIdentityProvider(input, workspaceId);
return this.ssoService.editSSOIdentityProvider(input, workspaceId);
}
}