Skip to content

The open alternative to Salesforce, designed for AI.

Enforce UNLISTED view visibility when resolving query params (#26027)

Charles Bochet6dddeb133367
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
index 6a21ea38d31..f441e00c47b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
@@ -21,7 +21,14 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { DEFAULT_TIMEZONE } from 'src/engine/metadata-modules/view/constants/default-timezone.constant';
+import {
+ generateViewExceptionMessage,
+ ViewException,
+ ViewExceptionCode,
+ ViewExceptionMessageKey,
+} from 'src/engine/metadata-modules/view/exceptions/view.exception';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
+import { isViewVisibleToUser } from 'src/engine/metadata-modules/view/utils/is-view-visible-to-user.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
@@ -41,18 +48,33 @@ export class ViewQueryParamsService {
private readonly workspaceOrmManager: WorkspaceOrmManager,
) {}
- async resolveViewToQueryParams(
- viewId: string,
- workspaceId: string,
- currentWorkspaceMemberId?: string,
- ): Promise<ViewQueryParams> {
+ async resolveViewToQueryParams({
+ viewId,
+ workspaceId,
+ currentWorkspaceMemberId,
+ currentUserWorkspaceId,
+ }: {
+ viewId: string;
+ workspaceId: string;
+ currentWorkspaceMemberId?: string;
+ currentUserWorkspaceId?: string;
+ }): Promise<ViewQueryParams> {
const view = await this.viewService.findByIdWithRelations(
viewId,
workspaceId,
);
- if (!view) {
- throw new Error(`View with id ${viewId} not found`);
+ if (
+ !isDefined(view) ||
+ !isViewVisibleToUser(view, currentUserWorkspaceId)
+ ) {
+ throw new ViewException(
+ generateViewExceptionMessage(
+ ViewExceptionMessageKey.VIEW_NOT_FOUND,
+ viewId,
+ ),
+ ViewExceptionCode.VIEW_NOT_FOUND,
+ );
}
const { flatObjectMetadataMaps, flatFieldMetadataMaps } =
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
index 2b04be06ee3..26c90b31d5a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
-import { FeatureFlagKey, ViewType, ViewVisibility } from 'twenty-shared/types';
+import { FeatureFlagKey, ViewType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
@@ -33,6 +33,7 @@ import { UpdateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/up
import { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { fromFlatViewToViewDto } from 'src/engine/metadata-modules/view/utils/from-flat-view-to-view-dto.util';
+import { isViewVisibleToUser } from 'src/engine/metadata-modules/view/utils/is-view-visible-to-user.util';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
@@ -385,24 +386,6 @@ export class ViewService {
});
}
- private isViewVisibleToUser(
- view: {
- visibility: ViewVisibility;
- createdByUserWorkspaceId: string | null;
- },
- userWorkspaceId?: string,
- ): boolean {
- if (view.visibility === ViewVisibility.WORKSPACE) {
- return true;
- }
-
- return (
- view.visibility === ViewVisibility.UNLISTED &&
- isDefined(userWorkspaceId) &&
- view.createdByUserWorkspaceId === userWorkspaceId
- );
- }
-
private async getFilteredFlatViews({
workspaceId,
objectMetadataId,
@@ -446,7 +429,7 @@ export class ViewService {
viewTypes.length === 0 ||
viewTypes.includes(flatView.type),
)
- .filter((flatView) => this.isViewVisibleToUser(flatView, userWorkspaceId))
+ .filter((flatView) => isViewVisibleToUser(flatView, userWorkspaceId))
.sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.factory.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.factory.spec.ts
index b4665e96118..c5c3f7c4818 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.factory.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.factory.spec.ts
@@ -288,11 +288,12 @@ describe('ViewToolsFactory', () => {
expect(
viewQueryParamsService.resolveViewToQueryParams,
- ).toHaveBeenCalledWith(
- mockViewId,
- mockWorkspaceId,
- 'workspace-member-id',
- );
+ ).toHaveBeenCalledWith({
+ viewId: mockViewId,
+ workspaceId: mockWorkspaceId,
+ currentWorkspaceMemberId: 'workspace-member-id',
+ currentUserWorkspaceId: mockUserWorkspaceId,
+ });
expect(result).toEqual(mockQueryParams);
});
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts b/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts
index 3ddfced2cde..1393fd6b25e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts
@@ -648,11 +648,12 @@ export class ViewToolsFactory {
'Get filter and sort parameters from a view. Use these parameters with find_* tools to query records matching the view.',
inputSchema: GetViewQueryParamsInputSchema,
execute: async (parameters: { viewId: string }) => {
- return this.viewQueryParamsService.resolveViewToQueryParams(
- parameters.viewId,
+ return this.viewQueryParamsService.resolveViewToQueryParams({
+ viewId: parameters.viewId,
workspaceId,
currentWorkspaceMemberId,
- );
+ currentUserWorkspaceId: userWorkspaceId,
+ });
},
},
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/is-view-visible-to-user.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/is-view-visible-to-user.util.spec.ts
new file mode 100644
index 00000000000..4a443935048
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/is-view-visible-to-user.util.spec.ts
@@ -0,0 +1,68 @@
+import { ViewVisibility } from 'twenty-shared/types';
+
+import { isViewVisibleToUser } from 'src/engine/metadata-modules/view/utils/is-view-visible-to-user.util';
+
+describe('isViewVisibleToUser', () => {
+ it('allows a WORKSPACE view for anyone, including without an identity', () => {
+ expect(
+ isViewVisibleToUser(
+ {
+ visibility: ViewVisibility.WORKSPACE,
+ createdByUserWorkspaceId: 'someone-else',
+ },
+ 'me',
+ ),
+ ).toBe(true);
+ expect(
+ isViewVisibleToUser(
+ {
+ visibility: ViewVisibility.WORKSPACE,
+ createdByUserWorkspaceId: null,
+ },
+ undefined,
+ ),
+ ).toBe(true);
+ });
+
+ it('allows an UNLISTED view only for its owner', () => {
+ expect(
+ isViewVisibleToUser(
+ {
+ visibility: ViewVisibility.UNLISTED,
+ createdByUserWorkspaceId: 'me',
+ },
+ 'me',
+ ),
+ ).toBe(true);
+ });
+
+ it('denies an UNLISTED view to a non-owner', () => {
+ expect(
+ isViewVisibleToUser(
+ {
+ visibility: ViewVisibility.UNLISTED,
+ createdByUserWorkspaceId: 'someone-else',
+ },
+ 'me',
+ ),
+ ).toBe(false);
+ });
+
+ it('denies an UNLISTED view when there is no current identity', () => {
+ expect(
+ isViewVisibleToUser(
+ { visibility: ViewVisibility.UNLISTED, createdByUserWorkspaceId: 'me' },
+ undefined,
+ ),
+ ).toBe(false);
+ });
+
+ it('denies an ownerless UNLISTED view to everyone', () => {
+ expect(
+ isViewVisibleToUser(
+ { visibility: ViewVisibility.UNLISTED, createdByUserWorkspaceId: null },
+ 'me',
+ ),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-visible-to-user.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-visible-to-user.util.ts
new file mode 100644
index 00000000000..53bd207a76e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-visible-to-user.util.ts
@@ -0,0 +1,20 @@
+import { ViewVisibility } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+export const isViewVisibleToUser = (
+ view: {
+ visibility: ViewVisibility;
+ createdByUserWorkspaceId?: string | null;
+ },
+ userWorkspaceId?: string,
+): boolean => {
+ if (view.visibility === ViewVisibility.WORKSPACE) {
+ return true;
+ }
+
+ return (
+ view.visibility === ViewVisibility.UNLISTED &&
+ isDefined(userWorkspaceId) &&
+ view.createdByUserWorkspaceId === userWorkspaceId
+ );
+};