Skip to content

The open alternative to Salesforce, designed for AI.

Clear logoFileId when the workspace logo is removed (#25711)

martmull6b6f70ebad9c
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
index bb1ff860a0f..49a1e418325 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -321,6 +321,7 @@ export class WorkspaceService {
updatedWorkspace = await this.workspaceRepository.save({
...workspace,
...payload,
+ ...(payload.logo === null ? { logoFileId: null } : {}),
});
} catch (error) {
if (payload.customDomain && customDomainRegistered) {
diff --git a/packages/twenty-server/test/integration/metadata/suites/file/successful-workspace-logo-removal.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/file/successful-workspace-logo-removal.integration-spec.ts
new file mode 100644
index 00000000000..d2a71c10468
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/file/successful-workspace-logo-removal.integration-spec.ts
@@ -0,0 +1,50 @@
+import gql from 'graphql-tag';
+import { seedWorkspaceLogo } from 'test/integration/metadata/suites/file/utils/seed-workspace-logo.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+
+describe('Workspace logo removal should succeed', () => {
+ let workspaceId: string;
+ let cleanup: () => Promise<void>;
+
+ beforeAll(async () => {
+ jest.useRealTimers();
+
+ const seeded = await seedWorkspaceLogo();
+
+ workspaceId = seeded.workspaceId;
+ cleanup = seeded.cleanup;
+
+ jest.useFakeTimers();
+ }, 60000);
+
+ afterAll(async () => {
+ await cleanup();
+ });
+
+ it('should clear logoFileId so the resolver stops signing a deleted file', async () => {
+ jest.useRealTimers();
+
+ const response = await makeMetadataAPIRequest({
+ query: gql`
+ mutation UpdateWorkspace {
+ updateWorkspace(data: { logo: null }) {
+ id
+ logo
+ }
+ }
+ `,
+ });
+
+ jest.useFakeTimers();
+
+ expect(response.body.errors).toBeUndefined();
+ expect(response.body.data.updateWorkspace.logo).toBe('');
+
+ const [workspace] = await globalThis.testDataSource.query(
+ `SELECT "logoFileId" FROM core."workspace" WHERE id = $1`,
+ [workspaceId],
+ );
+
+ expect(workspace.logoFileId).toBeNull();
+ }, 30000);
+});