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

Microsoft-multi-tenant (#9801)

Browse Source 
Microsoft fixes
This commit is contained in:
Guillim
2025-01-23 12:08:08 +01:00
committed by GitHub
parent bddca09451
commit 2f0fa7ae3e
11 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service.ts
View File

@ -17,10 +17,6 @@ export class MicrosoftOAuth2ClientManagerService {
callback: AuthProviderCallback,
) => {
try {
const tenantId = this.environmentService.get(
'AUTH_MICROSOFT_TENANT_ID',
);
const urlData = new URLSearchParams();
urlData.append(
@ -36,7 +32,7 @@ export class MicrosoftOAuth2ClientManagerService {
urlData.append('grant_type', 'refresh_token');
const res = await fetch(
`https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
`https://login.microsoftonline.com/common/oauth2/v2.0/token`,
{
method: 'POST',
body: urlData,

7
packages/twenty-server/src/modules/contact-creation-manager/utils/filter-out-contacts-from-company-or-workspace.util.ts
View File

@ -2,6 +2,7 @@ import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/s
import { Contact } from 'src/modules/contact-creation-manager/types/contact.type';
import { getDomainNameFromHandle } from 'src/modules/contact-creation-manager/utils/get-domain-name-from-handle.util';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
import { isWorkDomain } from 'src/utils/is-work-email';
export function filterOutSelfAndContactsFromCompanyOrWorkspace(
contacts: Contact[],
@ -21,9 +22,13 @@ export function filterOutSelfAndContactsFromCompanyOrWorkspace(
new Map<string, boolean>(),
);
const isDifferentDomain = (contact: Contact, selfDomainName: string) =>
getDomainNameFromHandle(contact.handle) !== selfDomainName;
return contacts.filter(
(contact) =>
getDomainNameFromHandle(contact.handle) !== selfDomainName &&
(isDifferentDomain(contact, selfDomainName) ||
!isWorkDomain(selfDomainName)) &&
!workspaceMembersMap[contact.handle] &&
!handleAliases.includes(contact.handle),
);