Skip to content

The open alternative to Salesforce, designed for AI.

Give the rebuilt user auth context its full workspace (#28692)

Paul Rastoincab75c67719d
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
index 61169b07386..f7cb1a7ef82 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
@@ -4,8 +4,9 @@ import { isNonEmptyString } from '@sniptt/guards';
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
-import { isDefined } from 'twenty-shared/utils';
+import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
+import { CoreEntityCacheService } from 'src/engine/core-entity-cache/services/core-entity-cache.service';
import {
AuthException,
AuthExceptionCode,
@@ -13,7 +14,6 @@ import {
import { buildUserAuthContext } from 'src/engine/core-modules/auth/utils/build-user-auth-context.util';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { fromUserEntityToFlat } from 'src/engine/core-modules/user/utils/from-user-entity-to-flat.util';
-import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Injectable()
@@ -22,6 +22,7 @@ export class UserWorkspaceAuthContextService {
@InjectRepository(UserWorkspaceEntity)
private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly coreEntityCacheService: CoreEntityCacheService,
) {}
async resolveWorkspaceMember({
@@ -150,8 +151,21 @@ export class UserWorkspaceAuthContextService {
);
}
}
+ const workspace = await this.coreEntityCacheService.get(
+ 'workspaceEntity',
+ workspaceId,
+ );
+
+ assertIsDefinedOrThrow(
+ workspace,
+ new AuthException(
+ 'Workspace not found',
+ AuthExceptionCode.WORKSPACE_NOT_FOUND,
+ ),
+ );
+
return buildUserAuthContext({
- workspace: { id: workspaceId } as FlatWorkspace,
+ workspace,
application,
viaApplication: matchingUserContext?.viaApplication,
userWorkspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
index d641b6f1d24..ff826666066 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
@@ -33,7 +33,6 @@ import {
} from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-turn.service';
import { guideUncallableToolCallsToMetaTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/guide-uncallable-tool-calls-to-meta-tool.util';
import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util';
-import { fromWorkspaceEntityToFlat } from 'src/engine/core-modules/workspace/utils/from-workspace-entity-to-flat.util';
import { resolveAgentRunCallingApplication } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/resolve-agent-run-calling-application.util';
import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';
import { AGENT_CHAT_KEEPALIVE_INTERVAL_MS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-keepalive-interval-ms.constant';
@@ -170,11 +169,7 @@ export class ChatExecutionService {
locale,
onCodeExecutionUpdate,
...authorization,
- // The chat auth context only carries the workspace id, which can't tell the custom application apart
- application: resolveAgentRunCallingApplication({
- ...authorization.authContext,
- workspace: fromWorkspaceEntityToFlat(workspace),
- }),
+ application: resolveAgentRunCallingApplication(authorization.authContext),
resolveExecutionContext,
};
diff --git a/packages/twenty-server/test/integration/ai/suites/ask-ai-application-token-tools.integration-spec.ts b/packages/twenty-server/test/integration/ai/suites/ask-ai-application-token-tools.integration-spec.ts
index cf7fa14e46b..15439b56c6c 100644
--- a/packages/twenty-server/test/integration/ai/suites/ask-ai-application-token-tools.integration-spec.ts
+++ b/packages/twenty-server/test/integration/ai/suites/ask-ai-application-token-tools.integration-spec.ts
@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto';
import gql from 'graphql-tag';
import { TEST_AI_MODEL_ID } from 'test/integration/constants/test-ai-model-ids.constants';
+import { findWorkspaceCustomApplicationId } from 'test/integration/metadata/suites/application-default-role/utils/find-application-default-role.util';
import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
import {
type ApplicationWithVariable,
@@ -123,6 +124,7 @@ const sendChatMessageAndWaitForAnswer = async (token: string) => {
describe('Ask AI tools for an installed application acting for a user', () => {
let application: ApplicationWithVariable;
let applicationToken: string;
+ let workspaceCustomApplicationToken: string;
const threadIds: string[] = [];
beforeAll(async () => {
@@ -141,6 +143,14 @@ describe('Ask AI tools for an installed application acting for a user', () => {
});
applicationToken = applicationAccessToken.token;
+
+ const { applicationAccessToken: workspaceCustomApplicationAccessToken } =
+ await generateAppleAdminApplicationTokenPair({
+ applicationId: await findWorkspaceCustomApplicationId(),
+ });
+
+ workspaceCustomApplicationToken =
+ workspaceCustomApplicationAccessToken.token;
});
beforeEach(() => jest.useRealTimers());
@@ -184,4 +194,19 @@ describe('Ask AI tools for an installed application acting for a user', () => {
},
CHAT_TURN_TIMEOUT_MS,
);
+
+ it(
+ 'still offers the workflow tools to the workspace custom application',
+ async () => {
+ const offeredToolContexts = mockAnsweringModel();
+
+ threadIds.push(
+ await sendChatMessageAndWaitForAnswer(workspaceCustomApplicationToken),
+ );
+
+ expect(offeredToolContexts).toHaveLength(1);
+ expect(offeredToolContexts[0]).toContain(WORKFLOW_TOOL_NAME);
+ },
+ CHAT_TURN_TIMEOUT_MS,
+ );
});