Skip to content

The open alternative to Salesforce, designed for AI.

perf(slack): cache the installed Slack team id (#26494)

Abdul Rahman5b6b7c7bbbfb
diff --git a/packages/twenty-apps/public/slack/package.json b/packages/twenty-apps/public/slack/package.json
index ae5ca40476b..887c4d95211 100644
--- a/packages/twenty-apps/public/slack/package.json
+++ b/packages/twenty-apps/public/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@twentyhq/slack",
- "version": "1.4.1",
+ "version": "1.4.2",
"description": "Slack assistant and workflow steps for Twenty",
"license": "MIT",
"engines": {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts
index 8469f652538..ad692de0806 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts
@@ -97,6 +97,7 @@ export const slackAssistantWorkerHandler = async (
requestMessage,
threadMessages,
slackClient,
+ slackConnectionId,
assistantBotUserId,
isDirectMessage,
},
@@ -114,6 +115,7 @@ export const slackAssistantWorkerHandler = async (
const runAsWorkspaceMemberId = await resolveSlackRunAsForRequest({
client,
slackClient,
+ slackConnectionId,
assistantBotUserId,
identity: requesterIdentity,
requestId: record.id,
@@ -168,6 +170,7 @@ export const slackAssistantWorkerHandler = async (
accessMode: channelAccessPolicy.accessMode,
client,
slackClient,
+ slackConnectionId,
identity: requesterIdentity,
runAsWorkspaceMemberId,
});
@@ -226,6 +229,7 @@ export const slackAssistantWorkerHandler = async (
conversationMessages,
client,
slackClient,
+ slackConnectionId,
assistantBotUserId,
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts
index 744da796b1b..6c7fbc25aef 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-list-unlinked-users-handler.ts
@@ -37,7 +37,10 @@ export const slackListUnlinkedUsersHandler =
const slackClient = slackClientResult.client;
- const installedTeamId = await getInstalledSlackTeamId(slackClient);
+ const installedTeamId = await getInstalledSlackTeamId({
+ slackClient,
+ slackConnectionId: slackClientResult.connectionId,
+ });
if (!isDefined(installedTeamId)) {
return {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-match-user-links-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-match-user-links-handler.ts
index c7c50f3e3ff..d3c75c64bbe 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-match-user-links-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-match-user-links-handler.ts
@@ -33,7 +33,10 @@ export const slackMatchUserLinksHandler =
const slackClient = slackClientResult.client;
- const installedTeamId = await getInstalledSlackTeamId(slackClient);
+ const installedTeamId = await getInstalledSlackTeamId({
+ slackClient,
+ slackConnectionId: slackClientResult.connectionId,
+ });
if (!isDefined(installedTeamId)) {
return {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-resolve-user-link-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-resolve-user-link-handler.ts
index 75720e63cd6..852349dddab 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-resolve-user-link-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-resolve-user-link-handler.ts
@@ -65,7 +65,10 @@ export const slackResolveUserLinkHandler = async (
}
const slackClient = slackClientResult.client;
- const installedTeamId = await getInstalledSlackTeamId(slackClient);
+ const installedTeamId = await getInstalledSlackTeamId({
+ slackClient,
+ slackConnectionId: slackClientResult.connectionId,
+ });
if (!isNonEmptyString(installedTeamId)) {
return {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-search-users-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-search-users-handler.ts
index 73e47bca49d..68c3ccf5b56 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-search-users-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-search-users-handler.ts
@@ -61,7 +61,10 @@ export const slackSearchUsersHandler = async (
const slackClient = slackClientResult.client;
- const installedTeamId = await getInstalledSlackTeamId(slackClient);
+ const installedTeamId = await getInstalledSlackTeamId({
+ slackClient,
+ slackConnectionId: slackClientResult.connectionId,
+ });
if (!isDefined(installedTeamId)) {
return {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-channel-rule-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-channel-rule-handler.ts
index e4dfbcb80c4..a827baeeec6 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-channel-rule-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-channel-rule-handler.ts
@@ -115,7 +115,10 @@ export const slackSetChannelRuleHandler = async (
};
}
- const installedTeamId = await getInstalledSlackTeamId(slackClient);
+ const installedTeamId = await getInstalledSlackTeamId({
+ slackClient,
+ slackConnectionId: slackClientResult.connectionId,
+ });
const slackTeamId =
readOptionalString(channel.context_team_id) ?? installedTeamId;
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-user-link-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-user-link-handler.ts
index 416508ae3cc..43708b7c781 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-user-link-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-set-user-link-handler.ts
@@ -78,7 +78,10 @@ export const slackSetUserLinkHandler = async (
const slackClient = slackClientResult.client;
- const installedTeamId = await getInstalledSlackTeamId(slackClient);
+ const installedTeamId = await getInstalledSlackTeamId({
+ slackClient,
+ slackConnectionId: slackClientResult.connectionId,
+ });
if (!isNonEmptyString(installedTeamId)) {
return {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/get-installed-slack-team-id.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/get-installed-slack-team-id.test.ts
new file mode 100644
index 00000000000..881949a857f
--- /dev/null
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/get-installed-slack-team-id.test.ts
@@ -0,0 +1,136 @@
+import { type AuthTestResponse } from '@slack/web-api';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { getInstalledSlackTeamId } from 'src/logic-functions/utils/get-installed-slack-team-id';
+
+const { getSlackConnectedAccountTeamMock, setSlackConnectedAccountTeamMock } =
+ vi.hoisted(() => ({
+ getSlackConnectedAccountTeamMock: vi.fn(),
+ setSlackConnectedAccountTeamMock: vi.fn(),
+ }));
+
+vi.mock('src/logic-functions/utils/get-slack-connected-account-team', () => ({
+ getSlackConnectedAccountTeam: getSlackConnectedAccountTeamMock,
+}));
+
+vi.mock('src/logic-functions/utils/set-slack-connected-account-team', () => ({
+ setSlackConnectedAccountTeam: setSlackConnectedAccountTeamMock,
+}));
+
+const TEAM_ID = 'T123';
+const CONNECTION_ID = 'connection-1';
+
+const createAuthTestMock = () => vi.fn<() => Promise<AuthTestResponse>>();
+
+const buildSlackClient = (
+ authTestMock: ReturnType<typeof createAuthTestMock>,
+) => ({ auth: { test: authTestMock } });
+
+describe('getInstalledSlackTeamId', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ setSlackConnectedAccountTeamMock.mockResolvedValue(undefined);
+ });
+
+ it('should return the team stored for the connection without calling Slack', async () => {
+ getSlackConnectedAccountTeamMock.mockResolvedValue(TEAM_ID);
+ const authTestMock = createAuthTestMock();
+
+ const result = await getInstalledSlackTeamId({
+ slackClient: buildSlackClient(authTestMock),
+ slackConnectionId: CONNECTION_ID,
+ });
+
+ expect(result).toBe(TEAM_ID);
+ expect(authTestMock).not.toHaveBeenCalled();
+ expect(getSlackConnectedAccountTeamMock).toHaveBeenCalledWith(
+ CONNECTION_ID,
+ );
+ });
+
+ it('should ask Slack and heal the stored team when nothing is stored', async () => {
+ getSlackConnectedAccountTeamMock.mockResolvedValue(null);
+ const authTestMock = createAuthTestMock().mockResolvedValue({
+ ok: true,
+ team_id: TEAM_ID,
+ });
+
+ const result = await getInstalledSlackTeamId({
+ slackClient: buildSlackClient(authTestMock),
+ slackConnectionId: CONNECTION_ID,
+ });
+
+ expect(result).toBe(TEAM_ID);
+ expect(authTestMock).toHaveBeenCalledTimes(1);
+ expect(setSlackConnectedAccountTeamMock).toHaveBeenCalledWith({
+ connectedAccountId: CONNECTION_ID,
+ slackTeamId: TEAM_ID,
+ });
+ });
+
+ it('should fall back to Slack when the stored team cannot be read', async () => {
+ getSlackConnectedAccountTeamMock.mockRejectedValue(
+ new Error('kv unavailable'),
+ );
+ const authTestMock = createAuthTestMock().mockResolvedValue({
+ ok: true,
+ team_id: TEAM_ID,
+ });
+
+ const result = await getInstalledSlackTeamId({
+ slackClient: buildSlackClient(authTestMock),
+ slackConnectionId: CONNECTION_ID,
+ });
+
+ expect(result).toBe(TEAM_ID);
+ });
+
+ it('should ask Slack without touching the store when no connection is known', async () => {
+ const authTestMock = createAuthTestMock().mockResolvedValue({
+ ok: true,
+ team_id: TEAM_ID,
+ });
+
+ const result = await getInstalledSlackTeamId({
+ slackClient: buildSlackClient(authTestMock),
+ slackConnectionId: undefined,
+ });
+
+ expect(result).toBe(TEAM_ID);
+ expect(getSlackConnectedAccountTeamMock).not.toHaveBeenCalled();
+ expect(setSlackConnectedAccountTeamMock).not.toHaveBeenCalled();
+ });
+
+ it('should return undefined without throwing when Slack rejects', async () => {
+ getSlackConnectedAccountTeamMock.mockResolvedValue(null);
+ const authTestMock = createAuthTestMock().mockRejectedValue(
+ new Error('invalid_auth'),
+ );
+
+ const result = await getInstalledSlackTeamId({
+ slackClient: buildSlackClient(authTestMock),
+ slackConnectionId: CONNECTION_ID,
+ });
+
+ expect(result).toBeUndefined();
+ expect(setSlackConnectedAccountTeamMock).not.toHaveBeenCalled();
+ });
+
+ it('should still return the team when healing the stored team fails', async () => {
+ getSlackConnectedAccountTeamMock.mockResolvedValue(null);
+ setSlackConnectedAccountTeamMock.mockRejectedValue(
+ new Error('kv unavailable'),
+ );
+ const authTestMock = createAuthTestMock().mockResolvedValue({
+ ok: true,
+ team_id: TEAM_ID,
+ });
+
+ const result = await getInstalledSlackTeamId({
+ slackClient: buildSlackClient(authTestMock),
+ slackConnectionId: CONNECTION_ID,
+ });
+
+ expect(result).toBe(TEAM_ID);
+ });
+});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-access-decision.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-access-decision.test.ts
index a33fafa7b59..a3b2b74a523 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-access-decision.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-access-decision.test.ts
@@ -25,6 +25,7 @@ const identity: SlackUserIdentity = {
};
const client = {} as CoreApiClient;
+const SLACK_CONNECTION_ID = 'connection-1';
const slackClient = {} as WebClient;
const RESOLUTION_BASE = {
@@ -50,6 +51,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ANYONE',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity: undefined,
runAsWorkspaceMemberId: undefined,
}),
@@ -64,6 +66,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: 'member-id',
}),
@@ -85,6 +88,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -99,6 +103,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -113,6 +118,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -131,6 +137,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -147,6 +154,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -161,6 +169,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -173,6 +182,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient: undefined,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity,
runAsWorkspaceMemberId: undefined,
}),
@@ -183,6 +193,7 @@ describe('resolveSlackAccessDecision', () => {
accessMode: 'ONLY_LINKED_MEMBERS',
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
identity: undefined,
runAsWorkspaceMemberId: undefined,
}),
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-assistant-mentions.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-assistant-mentions.test.ts
index 614cd2f1768..460552f9439 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-assistant-mentions.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-assistant-mentions.test.ts
@@ -14,6 +14,7 @@ vi.mock('src/logic-functions/utils/resolve-slack-mention-labels', () => ({
}));
const client = {} as CoreApiClient;
+const SLACK_CONNECTION_ID = 'connection-1';
const slackClient = {} as WebClient;
const ALICE: SlackMentionLabel = {
@@ -38,6 +39,7 @@ const resolve = (
conversationMessages,
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId: 'UBOT',
});
@@ -125,6 +127,7 @@ describe('resolveSlackAssistantMentions', () => {
slackUserIds: ['U04ABC', 'U05DEF'],
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId: 'UBOT',
});
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-identities.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-identities.test.ts
index b6c9afc534e..fc9dfb41059 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-identities.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-identities.test.ts
@@ -9,9 +9,11 @@ import { resolveSlackIdentities } from 'src/logic-functions/utils/resolve-slack-
const {
findSlackUserLinksBySlackUserIdsMock,
findWorkspaceMemberIdsByEmailsMock,
+ getSlackConnectedAccountTeamMock,
} = vi.hoisted(() => ({
findSlackUserLinksBySlackUserIdsMock: vi.fn(),
findWorkspaceMemberIdsByEmailsMock: vi.fn(),
+ getSlackConnectedAccountTeamMock: vi.fn(),
}));
vi.mock(
@@ -25,6 +27,10 @@ vi.mock('src/logic-functions/data/find-workspace-member-ids-by-emails', () => ({
findWorkspaceMemberIdsByEmails: findWorkspaceMemberIdsByEmailsMock,
}));
+vi.mock('src/logic-functions/utils/get-slack-connected-account-team', () => ({
+ getSlackConnectedAccountTeam: getSlackConnectedAccountTeamMock,
+}));
+
const INSTALLED_TEAM_ID = 'T0INSTALLED';
const EXTERNAL_TEAM_ID = 'T0EXTERNAL';
@@ -33,6 +39,8 @@ const client = {} as CoreApiClient;
const authTestMock = vi.fn();
const usersInfoMock = vi.fn();
+const SLACK_CONNECTION_ID = 'connection-1';
+
const slackClient = {
auth: { test: authTestMock },
users: { info: usersInfoMock },
@@ -70,12 +78,14 @@ const resolve = (knownIdentities: SlackUserIdentity[]) =>
knownIdentities,
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
});
describe('resolveSlackIdentities', () => {
beforeEach(() => {
vi.clearAllMocks();
authTestMock.mockResolvedValue({ team_id: INSTALLED_TEAM_ID });
+ getSlackConnectedAccountTeamMock.mockResolvedValue(null);
findSlackUserLinksBySlackUserIdsMock.mockResolvedValue(new Map());
findWorkspaceMemberIdsByEmailsMock.mockResolvedValue({
workspaceMemberIdByEmail: new Map(),
@@ -84,6 +94,21 @@ describe('resolveSlackIdentities', () => {
usersInfoMock.mockResolvedValue(undefined);
});
+ it('should read the installed team of the connection the client came from', async () => {
+ getSlackConnectedAccountTeamMock.mockResolvedValue(INSTALLED_TEAM_ID);
+ findSlackUserLinksBySlackUserIdsMock.mockResolvedValue(
+ new Map([['U04ABC', link()]]),
+ );
+
+ expect((await resolve([identity()])).get('U04ABC')).toEqual(
+ expect.objectContaining({ outcome: 'confirmedMember' }),
+ );
+ expect(getSlackConnectedAccountTeamMock).toHaveBeenCalledWith(
+ SLACK_CONNECTION_ID,
+ );
+ expect(authTestMock).not.toHaveBeenCalled();
+ });
+
it('should credit a hand-picked consented link as the source of the member', async () => {
findSlackUserLinksBySlackUserIdsMock.mockResolvedValue(
new Map([['U04ABC', link()]]),
@@ -231,6 +256,7 @@ describe('resolveSlackIdentities', () => {
slackUserIds: ['U0GONE'],
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
});
expect(resolutions.get('U0GONE')).toEqual({
@@ -246,6 +272,7 @@ describe('resolveSlackIdentities', () => {
slackUserIds: ['U04ABC'],
client,
slackClient: undefined,
+ slackConnectionId: SLACK_CONNECTION_ID,
});
expect(resolutions.get('U04ABC')?.outcome).toBe('unidentified');
@@ -268,6 +295,7 @@ describe('resolveSlackIdentities', () => {
slackUserIds: Array.from({ length: 30 }, (_unused, index) => `U${index}`),
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
});
expect(usersInfoMock.mock.calls.length).toBeLessThanOrEqual(8);
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-mention-labels.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-mention-labels.test.ts
index e047366210b..b935059dcec 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-mention-labels.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-mention-labels.test.ts
@@ -21,6 +21,7 @@ vi.mock('src/logic-functions/data/find-workspace-member-names-by-ids', () => ({
}));
const client = {} as CoreApiClient;
+const SLACK_CONNECTION_ID = 'connection-1';
const slackClient = {} as WebClient;
const identity = (displayName: string | undefined): SlackUserIdentity => ({
@@ -50,6 +51,7 @@ const labelFor = async (slackUserId = 'U04ABC') =>
slackUserIds: [slackUserId],
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId: 'UBOT',
})
).get(slackUserId)?.label;
@@ -141,6 +143,7 @@ describe('resolveSlackMentionLabels', () => {
slackUserIds: ['UBOT'],
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId: 'UBOT',
});
@@ -153,6 +156,7 @@ describe('resolveSlackMentionLabels', () => {
slackUserIds: Array.from({ length: 30 }, (_unused, index) => `U${index}`),
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId: 'UBOT',
});
@@ -181,6 +185,7 @@ describe('resolveSlackMentionLabels', () => {
slackUserIds: ['U04ABC', 'U05DEF'],
client,
slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId: 'UBOT',
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-for-request.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-for-request.test.ts
index 6a4f3c79515..58928f6891d 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-for-request.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-for-request.test.ts
@@ -29,6 +29,7 @@ vi.mock(
);
const client = {} as CoreApiClient;
+const SLACK_CONNECTION_ID = 'connection-1';
const slackClient = {} as WebClient;
const SLACK_USER_ID = 'U0123456789';
@@ -64,6 +65,7 @@ const resolve = (
client,
slackClient:
'slackClient' in overrides ? overrides.slackClient : slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
assistantBotUserId:
'assistantBotUserId' in overrides
? overrides.assistantBotUserId
@@ -203,7 +205,11 @@ describe('resolveSlackRunAsForRequest', () => {
user: 'U0SOMEONEELSE',
text: `<@${BOT_USER_ID}> a colleague's question`,
},
- { ts: '1700000000.000100', user: BOT_USER_ID, text: 'Earlier answer' },
+ {
+ ts: '1700000000.000100',
+ user: BOT_USER_ID,
+ text: 'Earlier answer',
+ },
MENTIONLESS_MESSAGE,
],
}),
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-workspace-member-id.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-workspace-member-id.test.ts
index 3485e105652..5d771b40e27 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-workspace-member-id.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/resolve-slack-run-as-workspace-member-id.test.ts
@@ -48,6 +48,7 @@ vi.mock('src/logic-functions/data/update-slack-user-link', () => ({
const client = {} as CoreApiClient;
const authTestMock = vi.fn();
+const SLACK_CONNECTION_ID = 'connection-1';
const slackClient = { auth: { test: authTestMock } } as unknown as WebClient;
const IDENTITY: SlackUserIdentity = {
@@ -91,7 +92,12 @@ const expectNoEmailMatchConsulted = () =>
});
const runAs = (identity: SlackUserIdentity = IDENTITY) =>
- resolveSlackRunAsWorkspaceMemberId({ client, slackClient, identity });
+ resolveSlackRunAsWorkspaceMemberId({
+ client,
+ slackClient,
+ slackConnectionId: SLACK_CONNECTION_ID,
+ identity,
+ });
describe('resolveSlackRunAsWorkspaceMemberId', () => {
beforeEach(() => {
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/fetch-slack-assistant-context.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/fetch-slack-assistant-context.ts
index 11c3515383b..18916a23365 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/fetch-slack-assistant-context.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/fetch-slack-assistant-context.ts
@@ -24,6 +24,7 @@ type SlackAssistantContext = {
requestMessage: SlackThreadMessage | undefined;
threadMessages: SlackThreadMessage[];
slackClient: WebClient | undefined;
+ slackConnectionId: string | undefined;
assistantBotUserId: string | undefined;
isDirectMessage: boolean;
};
@@ -36,18 +37,21 @@ const UNREACHABLE_SLACK_CONTEXT: SlackAssistantContext = {
requestMessage: undefined,
threadMessages: [],
slackClient: undefined,
+ slackConnectionId: undefined,
assistantBotUserId: undefined,
isDirectMessage: false,
};
const readSlackThreadContext = async ({
client,
+ connectionId,
slackChannelId,
parentMessageTimestamp,
slackMessageTimestamp,
slackUserId,
}: {
client: WebClient;
+ connectionId: string;
slackChannelId: string;
parentMessageTimestamp: string;
slackMessageTimestamp: string;
@@ -93,6 +97,7 @@ const readSlackThreadContext = async ({
requestMessage,
threadMessages: tailMessages,
slackClient: client,
+ slackConnectionId: connectionId,
assistantBotUserId,
isDirectMessage,
};
@@ -133,11 +138,12 @@ export const fetchSlackAssistantContext = async ({
return UNREACHABLE_SLACK_CONTEXT;
}
- const { client } = slackClientResult;
+ const { client, connectionId } = slackClientResult;
return await runWithTimeout({
operation: readSlackThreadContext({
client,
+ connectionId,
slackChannelId,
parentMessageTimestamp,
slackMessageTimestamp,
@@ -149,7 +155,11 @@ export const fetchSlackAssistantContext = async ({
`[slack] assistant context read exceeded ${SLACK_ASSISTANT_CONTEXT_TIMEOUT_MS}ms, answering without thread history`,
);
- return { ...UNREACHABLE_SLACK_CONTEXT, slackClient: client };
+ return {
+ ...UNREACHABLE_SLACK_CONTEXT,
+ slackClient: client,
+ slackConnectionId: connectionId,
+ };
},
});
};
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/get-installed-slack-team-id.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/get-installed-slack-team-id.ts
index 2807a346e79..baa7fc3c776 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/get-installed-slack-team-id.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/get-installed-slack-team-id.ts
@@ -1,11 +1,43 @@
import { type WebClient } from '@slack/web-api';
import { isNonEmptyString } from '@sniptt/guards';
-export const getInstalledSlackTeamId = async (
- slackClient: WebClient,
-): Promise<string | undefined> => {
+import { getSlackConnectedAccountTeam } from 'src/logic-functions/utils/get-slack-connected-account-team';
+import { setSlackConnectedAccountTeam } from 'src/logic-functions/utils/set-slack-connected-account-team';
+
+type SlackAuthTestClient = {
+ auth: Pick<WebClient['auth'], 'test'>;
+};
+
+export const getInstalledSlackTeamId = async ({
+ slackClient,
+ slackConnectionId,
+}: {
+ slackClient: SlackAuthTestClient;
+ slackConnectionId: string | undefined;
+}): Promise<string | undefined> => {
+ if (isNonEmptyString(slackConnectionId)) {
+ const storedTeamId = await getSlackConnectedAccountTeam(
+ slackConnectionId,
+ ).catch(() => null);
+
+ if (isNonEmptyString(storedTeamId)) {
+ return storedTeamId;
+ }
+ }
+
const authResult = await slackClient.auth.test().catch(() => undefined);
const installedTeamId = authResult?.team_id;
- return isNonEmptyString(installedTeamId) ? installedTeamId : undefined;
+ if (!isNonEmptyString(installedTeamId)) {
+ return undefined;
+ }
+
+ if (isNonEmptyString(slackConnectionId)) {
+ await setSlackConnectedAccountTeam({
+ connectedAccountId: slackConnectionId,
+ slackTeamId: installedTeamId,
+ }).catch(() => undefined);
+ }
+
+ return installedTeamId;
};
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/present-slack-record-details.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/present-slack-record-details.ts
index dd9e31c7601..e1425a35528 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/present-slack-record-details.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/present-slack-record-details.ts
@@ -90,6 +90,7 @@ export const presentSlackRecordDetails = async (
const workspaceMemberId = await resolveSlackRunAsWorkspaceMemberId({
client,
slackClient,
+ slackConnectionId: slackClientResult.connectionId,
identity,
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/register-slack-connection.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/register-slack-connection.ts
index e2dff26569e..50c585852dd 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/register-slack-connection.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/register-slack-connection.ts
@@ -4,9 +4,9 @@ import { getConnection, kv } from 'twenty-sdk/logic-function';
import { autoLinkSlackInstaller } from 'src/logic-functions/utils/auto-link-slack-installer';
import { cacheSlackBotUserId } from 'src/logic-functions/utils/cache-slack-bot-user-id';
-import { getSlackConnectedAccountTeamKvKey } from 'src/logic-functions/utils/get-slack-connected-account-team-kv-key';
import { getSlackTeamKvKey } from 'src/logic-functions/utils/get-slack-team-kv-key';
import { matchSlackRosterByEmail } from 'src/logic-functions/utils/match-slack-roster-by-email';
+import { setSlackConnectedAccountTeam } from 'src/logic-functions/utils/set-slack-connected-account-team';
import { toErrorMessage } from 'src/logic-functions/utils/to-error-message.util';
type RegisterSlackConnectionArgs = {
@@ -39,7 +39,10 @@ export const registerSlackConnection = async ({
throw new Error('Slack auth.test returned no user_id for the bot');
}
- await kv.set(getSlackConnectedAccountTeamKvKey(connectedAccountId), teamId);
+ await setSlackConnectedAccountTeam({
+ connectedAccountId,
+ slackTeamId: teamId,
+ });
await kv.set(getSlackTeamKvKey(teamId), null, { scope: 'SERVER' });
await cacheSlackBotUserId(botUserId);
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-access-decision.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-access-decision.ts
index 380eab4d628..109db1dfb9e 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-access-decision.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-access-decision.ts
@@ -13,12 +13,14 @@ export const resolveSlackAccessDecision = async ({
accessMode,
client,
slackClient,
+ slackConnectionId,
identity,
runAsWorkspaceMemberId,
}: {
accessMode: SlackAccessMode;
client: CoreApiClient;
slackClient: WebClient | undefined;
+ slackConnectionId: string | undefined;
identity: SlackUserIdentity | undefined;
runAsWorkspaceMemberId: string | undefined;
}): Promise<SlackAccessDecision> => {
@@ -41,6 +43,7 @@ export const resolveSlackAccessDecision = async ({
knownIdentities: [identity],
client,
slackClient,
+ slackConnectionId,
}).catch(() => undefined);
const resolution = resolutionBySlackUserId?.get(slackUserId);
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-assistant-mentions.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-assistant-mentions.ts
index d9205c140fa..5cfcab61b69 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-assistant-mentions.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-assistant-mentions.ts
@@ -67,12 +67,14 @@ export const resolveSlackAssistantMentions = async ({
conversationMessages,
client,
slackClient,
+ slackConnectionId,
assistantBotUserId,
}: {
requestText: string;
conversationMessages: SlackAssistantAgentMessage[];
client: CoreApiClient;
slackClient: WebClient | undefined;
+ slackConnectionId: string | undefined;
assistantBotUserId: string | undefined;
}): Promise<ResolvedSlackAssistantMentions> => {
const splitMessages = conversationMessages.map(splitAuthorPrefix);
@@ -91,6 +93,7 @@ export const resolveSlackAssistantMentions = async ({
slackUserIds: [...new Set([...mentionedUserIds, ...authorSlackUserIds])],
client,
slackClient,
+ slackConnectionId,
assistantBotUserId,
}).catch((error) => {
console.warn(
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-identities.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-identities.ts
index cacc3f719a0..bd8e2b7dc87 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-identities.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-identities.ts
@@ -140,11 +140,13 @@ export const resolveSlackIdentities = async ({
knownIdentities = [],
client,
slackClient,
+ slackConnectionId,
}: {
slackUserIds: string[];
knownIdentities?: SlackUserIdentity[];
client: CoreApiClient;
slackClient: WebClient | undefined;
+ slackConnectionId: string | undefined;
}): Promise<Map<string, SlackIdentityResolution>> => {
const resolutionBySlackUserId = new Map<string, SlackIdentityResolution>();
const requestedSlackUserIds = [...new Set(slackUserIds)];
@@ -167,7 +169,7 @@ export const resolveSlackIdentities = async ({
}
const [installedSlackTeamId, identityBySlackUserId] = await Promise.all([
- getInstalledSlackTeamId(slackClient),
+ getInstalledSlackTeamId({ slackClient, slackConnectionId }),
fetchMissingIdentities({
slackClient,
slackUserIds: requestedSlackUserIds,
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-mention-labels.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-mention-labels.ts
index 817837162d3..72f1aa3c8b2 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-mention-labels.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-mention-labels.ts
@@ -86,11 +86,13 @@ export const resolveSlackMentionLabels = async ({
slackUserIds,
client,
slackClient,
+ slackConnectionId,
assistantBotUserId,
}: {
slackUserIds: string[];
client: CoreApiClient;
slackClient: WebClient | undefined;
+ slackConnectionId: string | undefined;
assistantBotUserId: string | undefined;
}): Promise<Map<string, SlackMentionLabel>> => {
const labelBySlackUserId = new Map<string, SlackMentionLabel>();
@@ -123,6 +125,7 @@ export const resolveSlackMentionLabels = async ({
slackUserIds: mentionedUserIds,
client,
slackClient,
+ slackConnectionId,
});
const confirmedWorkspaceMemberIds = [
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-for-request.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-for-request.ts
index f4dc3441456..95dc2a90c6d 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-for-request.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-for-request.ts
@@ -49,6 +49,7 @@ const isMessageAddressedToBot = ({
export const resolveSlackRunAsForRequest = async ({
client,
slackClient,
+ slackConnectionId,
assistantBotUserId,
identity,
requestId,
@@ -59,6 +60,7 @@ export const resolveSlackRunAsForRequest = async ({
}: {
client: CoreApiClient;
slackClient: WebClient | undefined;
+ slackConnectionId: string | undefined;
assistantBotUserId: string | undefined;
identity: SlackUserIdentity | undefined;
requestId: string;
@@ -105,6 +107,7 @@ export const resolveSlackRunAsForRequest = async ({
return await resolveSlackRunAsWorkspaceMemberId({
client,
slackClient,
+ slackConnectionId,
identity,
});
};
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-workspace-member-id.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-workspace-member-id.ts
index b6aff348286..18c3e96db8a 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-workspace-member-id.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/resolve-slack-run-as-workspace-member-id.ts
@@ -54,10 +54,12 @@ const recordEmailMatchOnAutoLink = async ({
export const resolveSlackRunAsWorkspaceMemberId = async ({
client,
slackClient,
+ slackConnectionId,
identity,
}: {
client: CoreApiClient;
slackClient: WebClient;
+ slackConnectionId: string | undefined;
identity: SlackUserIdentity | undefined;
}): Promise<string | undefined> => {
if (!isDefined(identity) || !isNonEmptyString(identity.slackTeamId)) {
@@ -71,6 +73,7 @@ export const resolveSlackRunAsWorkspaceMemberId = async ({
knownIdentities: [identity],
client,
slackClient,
+ slackConnectionId,
}).catch(() => undefined);
const resolution = resolutionBySlackUserId?.get(slackUserId);
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/set-slack-connected-account-team.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/set-slack-connected-account-team.ts
new file mode 100644
index 00000000000..93d8d85fd68
--- /dev/null
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/set-slack-connected-account-team.ts
@@ -0,0 +1,16 @@
+import { kv } from 'twenty-sdk/logic-function';
+
+import { getSlackConnectedAccountTeamKvKey } from 'src/logic-functions/utils/get-slack-connected-account-team-kv-key';
+
+export const setSlackConnectedAccountTeam = async ({
+ connectedAccountId,
+ slackTeamId,
+}: {
+ connectedAccountId: string;
+ slackTeamId: string;
+}): Promise<void> => {
+ await kv.set(
+ getSlackConnectedAccountTeamKvKey(connectedAccountId),
+ slackTeamId,
+ );
+};
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/unfurl-slack-record-links.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/unfurl-slack-record-links.ts
index ef10c69bc5f..77b81fc499b 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/unfurl-slack-record-links.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/unfurl-slack-record-links.ts
@@ -75,6 +75,7 @@ export const unfurlSlackRecordLinks = async (
const workspaceMemberId = await resolveSlackRunAsWorkspaceMemberId({
client,
slackClient,
+ slackConnectionId: slackClientResult.connectionId,
identity,
});