Skip to content

The open alternative to Salesforce, designed for AI.

fix(auth): preserve connected account scopes on SSO login (#25296)

bucketbase264346109fc1c1
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
index 4f3d28d704f..0f37cb7a8af 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -1160,7 +1160,7 @@ export class AuthService {
case ConnectedAccountProvider.GOOGLE:
return ['email', 'profile'];
case ConnectedAccountProvider.MICROSOFT:
- return ['user.read'];
+ return ['User.Read'];
case ConnectedAccountProvider.OIDC:
return ['openid', 'email', 'profile'];
case ConnectedAccountProvider.SAML:
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.spec.ts
new file mode 100644
index 00000000000..425ac33f185
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.spec.ts
@@ -0,0 +1,76 @@
+import { Test, type TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { type Repository } from 'typeorm';
+
+import { CreateSsoConnectedAccountService } from 'src/engine/core-modules/auth/services/create-sso-connected-account.service';
+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
+
+describe('CreateSsoConnectedAccountService', () => {
+ let createSsoConnectedAccountService: CreateSsoConnectedAccountService;
+ let connectedAccountRepository: Repository<ConnectedAccountEntity>;
+ let userWorkspaceRepository: Repository<UserWorkspaceEntity>;
+
+ beforeEach(async () => {
+ const module: TestingModule = await Test.createTestingModule({
+ providers: [
+ CreateSsoConnectedAccountService,
+ {
+ provide: getRepositoryToken(ConnectedAccountEntity),
+ useValue: {
+ findOneBy: jest.fn(),
+ save: jest.fn(),
+ update: jest.fn(),
+ },
+ },
+ {
+ provide: getRepositoryToken(UserWorkspaceEntity),
+ useValue: {
+ findOneBy: jest.fn(),
+ },
+ },
+ ],
+ }).compile();
+
+ createSsoConnectedAccountService =
+ module.get<CreateSsoConnectedAccountService>(
+ CreateSsoConnectedAccountService,
+ );
+ connectedAccountRepository = module.get<Repository<ConnectedAccountEntity>>(
+ getRepositoryToken(ConnectedAccountEntity),
+ );
+ userWorkspaceRepository = module.get<Repository<UserWorkspaceEntity>>(
+ getRepositoryToken(UserWorkspaceEntity),
+ );
+ });
+
+ it('should preserve mailbox scopes when updating an SSO connected account', async () => {
+ const existingScopes = ['Mail.ReadWrite', 'Mail.Send', 'User.Read'];
+
+ jest.spyOn(userWorkspaceRepository, 'findOneBy').mockResolvedValue({
+ id: 'user-workspace-id',
+ } as UserWorkspaceEntity);
+ jest.spyOn(connectedAccountRepository, 'findOneBy').mockResolvedValue({
+ id: 'connected-account-id',
+ scopes: existingScopes,
+ } as ConnectedAccountEntity);
+
+ await createSsoConnectedAccountService.createOrUpdateSsoConnectedAccount({
+ workspaceId: 'workspace-id',
+ userId: 'user-id',
+ handle: '[email protected]',
+ provider: ConnectedAccountProvider.MICROSOFT,
+ scopes: ['User.Read'],
+ });
+
+ expect(connectedAccountRepository.update).toHaveBeenCalledTimes(1);
+ expect(connectedAccountRepository.update).toHaveBeenCalledWith(
+ 'connected-account-id',
+ expect.objectContaining({
+ scopes: existingScopes,
+ }),
+ );
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts
index 23cbec16df1..e8d66118a6d 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts
@@ -54,10 +54,14 @@ export class CreateSsoConnectedAccountService {
});
if (existing) {
+ const mergedScopes = Array.from(
+ new Set([...(existing.scopes ?? []), ...scopes]),
+ );
+
await this.connectedAccountRepository.update(existing.id, {
lastSignedInAt: new Date(),
provider,
- scopes,
+ scopes: mergedScopes,
...(oidcTokenClaims !== undefined
? { oidcTokenClaims: oidcTokenClaims as object }
: {}),
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
index 284e1ae2932..65805201e0f 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
@@ -42,7 +42,7 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy, 'microsoft') {
clientSecret: twentyConfigService.get('AUTH_MICROSOFT_CLIENT_SECRET'),
callbackURL: twentyConfigService.get('AUTH_MICROSOFT_CALLBACK_URL'),
tenant: 'common',
- scope: ['user.read'],
+ scope: ['User.Read'],
passReqToCallback: true,
});
}