The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Use Teams user links when matching the sender (#27898)
Abdul Rahman141ce7410cd0
diff --git a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/data/create-teams-user-link.ts b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/data/create-teams-user-link.tsnew file mode 100644index 00000000000..8a4af8be536--- /dev/null+++ b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/data/create-teams-user-link.ts@@ -0,0 +1,34 @@+import { type CoreApiClient } from 'twenty-client-sdk/core';++import { type TeamsUserLinkSource } from 'src/features/chat/logic-functions/types/teams-user-link-source.type';++export const createTeamsUserLink = async ({+ client,+ name,+ teamsTenantId,+ teamsUserAadObjectId,+ workspaceMemberId,+ source,+}: {+ client: Pick<CoreApiClient, 'mutation'>;+ name?: string;+ teamsTenantId: string;+ teamsUserAadObjectId: string;+ workspaceMemberId: string;+ source: TeamsUserLinkSource;+}): Promise<void> => {+ await client.mutation({+ createTeamsUserLink: {+ __args: {+ data: {+ name,+ teamsTenantId,+ teamsUserAadObjectId,+ workspaceMemberId,+ source,+ },+ },+ id: true,+ },+ });+};diff --git a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/data/find-teams-user-link-workspace-member-id.ts b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/data/find-teams-user-link-workspace-member-id.tsnew file mode 100644index 00000000000..9a9c6ee1eae--- /dev/null+++ b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/data/find-teams-user-link-workspace-member-id.ts@@ -0,0 +1,30 @@+import { isNonEmptyString } from '@sniptt/guards';+import { type CoreApiClient } from 'twenty-client-sdk/core';++export const findTeamsUserLinkWorkspaceMemberId = async ({+ client,+ teamsTenantId,+ teamsUserAadObjectId,+}: {+ client: Pick<CoreApiClient, 'query'>;+ teamsTenantId: string;+ teamsUserAadObjectId: string;+}): Promise<string | undefined> => {+ const queryResult = await client.query({+ teamsUserLinks: {+ __args: {+ filter: {+ teamsTenantId: { eq: teamsTenantId },+ teamsUserAadObjectId: { eq: teamsUserAadObjectId },+ },+ first: 1,+ },+ edges: { node: { workspaceMemberId: true } },+ },+ });++ const workspaceMemberId =+ queryResult.teamsUserLinks?.edges?.[0]?.node?.workspaceMemberId;++ return isNonEmptyString(workspaceMemberId) ? workspaceMemberId : undefined;+};diff --git a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/types/teams-user-link-source.type.ts b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/types/teams-user-link-source.type.tsnew file mode 100644index 00000000000..8aa39542dd0--- /dev/null+++ b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/types/teams-user-link-source.type.ts@@ -0,0 +1,4 @@+import { type TEAMS_USER_LINK_SOURCE } from 'src/features/chat/logic-functions/constants/teams-user-link-source';++export type TeamsUserLinkSource =+ (typeof TEAMS_USER_LINK_SOURCE)[keyof typeof TEAMS_USER_LINK_SOURCE];diff --git a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/__tests__/resolve-teams-sender-workspace-member-id.test.ts b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/__tests__/resolve-teams-sender-workspace-member-id.test.tsindex a0acae1df1d..bd46290b8e0 100644--- a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/__tests__/resolve-teams-sender-workspace-member-id.test.ts+++ b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/__tests__/resolve-teams-sender-workspace-member-id.test.ts@@ -2,11 +2,17 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';import { resolveTeamsSenderWorkspaceMemberId } from 'src/features/chat/logic-functions/utils/resolve-teams-sender-workspace-member-id';-const { getTeamsConversationMemberMock, findWorkspaceMemberIdByEmailMock } =- vi.hoisted(() => ({- getTeamsConversationMemberMock: vi.fn(),- findWorkspaceMemberIdByEmailMock: vi.fn(),- }));+const {+ getTeamsConversationMemberMock,+ findWorkspaceMemberIdByEmailMock,+ findTeamsUserLinkWorkspaceMemberIdMock,+ createTeamsUserLinkMock,+} = vi.hoisted(() => ({+ getTeamsConversationMemberMock: vi.fn(),+ findWorkspaceMemberIdByEmailMock: vi.fn(),+ findTeamsUserLinkWorkspaceMemberIdMock: vi.fn(),+ createTeamsUserLinkMock: vi.fn(),+}));vi.mock('src/features/chat/logic-functions/utils/get-teams-conversation-member',@@ -18,7 +24,21 @@ vi.mock(() => ({ findWorkspaceMemberIdByEmail: findWorkspaceMemberIdByEmailMock }),);-const CLIENT = { query: vi.fn() };+vi.mock(+ 'src/features/chat/logic-functions/data/find-teams-user-link-workspace-member-id',+ () => ({+ findTeamsUserLinkWorkspaceMemberId: findTeamsUserLinkWorkspaceMemberIdMock,+ }),+);++vi.mock(+ 'src/features/chat/logic-functions/data/create-teams-user-link',+ () => ({+ createTeamsUserLink: createTeamsUserLinkMock,+ }),+);++const CLIENT = { query: vi.fn(), mutation: vi.fn() };const CLAIMED_TENANT_ID = 'claimed-tenant-id';const resolve = () =>@@ -35,6 +55,69 @@ describe('resolveTeamsSenderWorkspaceMemberId', () => {beforeEach(() => {vi.clearAllMocks();findWorkspaceMemberIdByEmailMock.mockResolvedValue('workspace-member-id');+ findTeamsUserLinkWorkspaceMemberIdMock.mockResolvedValue(undefined);+ createTeamsUserLinkMock.mockResolvedValue(undefined);+ });++ it('should use the linked workspace member before matching on email', async () => {+ getTeamsConversationMemberMock.mockResolvedValue({+ id: '29:user-id',+ objectId: 'aad-object-id',+ tenantId: CLAIMED_TENANT_ID,+ email: '[email protected]',+ });+ findTeamsUserLinkWorkspaceMemberIdMock.mockResolvedValue(+ 'linked-workspace-member-id',+ );++ expect(await resolve()).toBe('linked-workspace-member-id');+ expect(findTeamsUserLinkWorkspaceMemberIdMock).toHaveBeenCalledTimes(1);+ expect(findTeamsUserLinkWorkspaceMemberIdMock).toHaveBeenCalledWith({+ client: CLIENT,+ teamsTenantId: CLAIMED_TENANT_ID,+ teamsUserAadObjectId: 'aad-object-id',+ });+ expect(findWorkspaceMemberIdByEmailMock).not.toHaveBeenCalled();+ expect(createTeamsUserLinkMock).not.toHaveBeenCalled();+ });++ it('should save a link when the sender is matched on email', async () => {+ getTeamsConversationMemberMock.mockResolvedValue({+ id: '29:user-id',+ objectId: 'aad-object-id',+ name: 'Jane Doe',+ tenantId: CLAIMED_TENANT_ID,+ email: '[email protected]',+ });++ expect(await resolve()).toBe('workspace-member-id');+ expect(createTeamsUserLinkMock).toHaveBeenCalledTimes(1);+ expect(createTeamsUserLinkMock).toHaveBeenCalledWith({+ client: CLIENT,+ name: 'Jane Doe',+ teamsTenantId: CLAIMED_TENANT_ID,+ teamsUserAadObjectId: 'aad-object-id',+ workspaceMemberId: 'workspace-member-id',+ source: 'AUTO',+ });+ });++ it('should still answer when saving the link fails', async () => {+ getTeamsConversationMemberMock.mockResolvedValue({+ id: '29:user-id',+ objectId: 'aad-object-id',+ tenantId: CLAIMED_TENANT_ID,+ email: '[email protected]',+ });+ createTeamsUserLinkMock.mockRejectedValue(new Error('duplicate link'));+ const consoleWarnSpy = vi+ .spyOn(console, 'warn')+ .mockImplementation(() => undefined);++ expect(await resolve()).toBe('workspace-member-id');+ expect(consoleWarnSpy).toHaveBeenCalledTimes(1);++ consoleWarnSpy.mockRestore();});it('should match the sender to a workspace member by email', async () => {diff --git a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/resolve-teams-sender-workspace-member-id.ts b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/resolve-teams-sender-workspace-member-id.tsindex 242e32e1ccb..7d920bd246b 100644--- a/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/resolve-teams-sender-workspace-member-id.ts+++ b/packages/twenty-apps/public/teams/src/features/chat/logic-functions/utils/resolve-teams-sender-workspace-member-id.ts@@ -2,11 +2,14 @@ import { isNonEmptyString } from '@sniptt/guards';import { type CoreApiClient } from 'twenty-client-sdk/core';import { isDefined } from 'twenty-sdk/utils';+import { TEAMS_USER_LINK_SOURCE } from 'src/features/chat/logic-functions/constants/teams-user-link-source';+import { createTeamsUserLink } from 'src/features/chat/logic-functions/data/create-teams-user-link';+import { findTeamsUserLinkWorkspaceMemberId } from 'src/features/chat/logic-functions/data/find-teams-user-link-workspace-member-id';import { findWorkspaceMemberIdByEmail } from 'src/features/chat/logic-functions/data/find-workspace-member-id-by-email';import { type TeamsConversationMember } from 'src/features/chat/logic-functions/types/teams-conversation-member.type';import { getTeamsConversationMember } from 'src/features/chat/logic-functions/utils/get-teams-conversation-member';-const isEmailVouchedForByClaimedTenant = ({+const isMemberOfClaimedTenant = ({member,teamsTenantId,}: {@@ -22,7 +25,7 @@ export const resolveTeamsSenderWorkspaceMemberId = async ({teamsTenantId,accessToken,}: {- client: Pick<CoreApiClient, 'query'>;+ client: Pick<CoreApiClient, 'query' | 'mutation'>;serviceUrl: string;conversationId: string;teamsUserId: string;@@ -36,15 +39,50 @@ export const resolveTeamsSenderWorkspaceMemberId = async ({accessToken,});- if (!isEmailVouchedForByClaimedTenant({ member, teamsTenantId })) {+ if (!isMemberOfClaimedTenant({ member, teamsTenantId })) {return undefined;}+ const teamsUserAadObjectId = member.objectId;++ if (isNonEmptyString(teamsUserAadObjectId)) {+ const linkedWorkspaceMemberId = await findTeamsUserLinkWorkspaceMemberId({+ client,+ teamsTenantId,+ teamsUserAadObjectId,+ });++ if (isDefined(linkedWorkspaceMemberId)) {+ return linkedWorkspaceMemberId;+ }+ }+const email = [member.email, member.userPrincipalName].find(isNonEmptyString);if (!isDefined(email)) {return undefined;}- return await findWorkspaceMemberIdByEmail({ client, email });+ const workspaceMemberId = await findWorkspaceMemberIdByEmail({+ client,+ email,+ });++ if (isDefined(workspaceMemberId) && isNonEmptyString(teamsUserAadObjectId)) {+ await createTeamsUserLink({+ client,+ name: member.name,+ teamsTenantId,+ teamsUserAadObjectId,+ workspaceMemberId,+ source: TEAMS_USER_LINK_SOURCE.AUTO,+ }).catch((error: unknown) =>+ console.warn(+ `[teams] could not save the user link for ${teamsUserAadObjectId}`,+ error,+ ),+ );+ }++ return workspaceMemberId;};diff --git a/packages/twenty-apps/public/teams/src/roles/default-function.role.ts b/packages/twenty-apps/public/teams/src/roles/default-function.role.tsindex c5ba70300d3..ad52b3615cc 100644--- a/packages/twenty-apps/public/teams/src/roles/default-function.role.ts+++ b/packages/twenty-apps/public/teams/src/roles/default-function.role.ts@@ -5,7 +5,10 @@ import {} from 'twenty-sdk/define';import { DEFAULT_ROLE_UNIVERSAL_IDENTIFIER } from 'src/constants/universal-identifiers';-import { TEAMS_ASSISTANT_REQUEST_OBJECT_UNIVERSAL_IDENTIFIER } from 'src/features/chat/constants/universal-identifiers';+import {+ TEAMS_ASSISTANT_REQUEST_OBJECT_UNIVERSAL_IDENTIFIER,+ TEAMS_USER_LINK_OBJECT_UNIVERSAL_IDENTIFIER,+} from 'src/features/chat/constants/universal-identifiers';export default defineApplicationRole({universalIdentifier: DEFAULT_ROLE_UNIVERSAL_IDENTIFIER,@@ -63,6 +66,13 @@ export default defineApplicationRole({canSoftDeleteObjectRecords: false,canDestroyObjectRecords: false,},+ {+ objectUniversalIdentifier: TEAMS_USER_LINK_OBJECT_UNIVERSAL_IDENTIFIER,+ canReadObjectRecords: true,+ canUpdateObjectRecords: true,+ canSoftDeleteObjectRecords: false,+ canDestroyObjectRecords: false,+ },],fieldPermissions: [],permissionFlagUniversalIdentifiers: [SystemPermissionFlag.AI],