9e21e55db4
## Fix resolver schema leaking between `/metadata` and `/graphql` endpoints ### Summary - Patch `@nestjs/graphql` to support a `resolverSchemaScope` option that filters resolvers at both schema generation and runtime, preventing cross-endpoint leaking - Introduce `@CoreResolver()` and `@MetadataResolver()` decorators to explicitly scope each resolver to its endpoint - Move most resolvers (auth, billing, workspace, user, etc.) to the metadata schema where the frontend expects them; only workflow and timeline calendar/messaging resolvers remain on `/graphql` - Fix frontend `SSEQuerySubscribeEffect` to use the default (metadata) Apollo client instead of the core client ### Problem NestJS GraphQL's module-based resolver discovery traverses transitive imports, causing resolvers from `/metadata` modules to leak into the `/graphql` schema and vice versa. This made the schemas unpredictable and tightly coupled to module import order. ### Approach - Added `resolverSchemaScope` to `GqlModuleOptions` via a patch on `@nestjs/graphql`, filtering in both `filterResolvers()` (runtime binding) and `getAllCtors()` (schema generation) - Each resolver is explicitly decorated with `@CoreResolver()` or `@MetadataResolver()` - Organized decorator, constant, and type files under `graphql-config/` following project conventions Core GQL Schema: (see: no more fields!) <img width="827" height="894" alt="image" src="https://github.com/user-attachments/assets/668f3f0f-485e-43f0-92be-4345aeccacb6" /> Metadata GQL Schema (see no more getTimelineCalendarEventsFromCompany) <img width="827" height="894" alt="image" src="https://github.com/user-attachments/assets/443913db-e5fe-4161-b0e7-4a971cc80a71" />
191 lines
5.8 KiB
TypeScript
191 lines
5.8 KiB
TypeScript
import request from 'supertest';
|
|
import { signUpOperationFactory } from 'test/integration/graphql/utils/sign-up-operation-factory.util';
|
|
|
|
import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
|
|
import { PermissionsExceptionMessage } from 'src/engine/metadata-modules/permissions/permissions.exception';
|
|
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
|
|
|
|
const client = request(`http://localhost:${APP_PORT}`);
|
|
|
|
describe('deleteUser', () => {
|
|
it('should not allow to delete user if they are the unique admin of a workspace', async () => {
|
|
const query = {
|
|
query: `
|
|
mutation DeleteUser {
|
|
deleteUser {
|
|
id
|
|
}
|
|
}
|
|
`,
|
|
};
|
|
|
|
await client
|
|
.post('/metadata')
|
|
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
|
|
.send(query)
|
|
.expect((res) => {
|
|
expect(res.body.data).toBeNull();
|
|
expect(res.body.errors).toBeDefined();
|
|
expect(res.body.errors[0].message).toBe(
|
|
'Cannot delete account: user is the unique admin of a workspace',
|
|
);
|
|
expect(res.body.errors[0].extensions.code).toBe(ErrorCode.FORBIDDEN);
|
|
});
|
|
});
|
|
|
|
it('should deny deleting another user when caller lacks WORKSPACE_MEMBERS permission', async () => {
|
|
const query = {
|
|
query: `
|
|
mutation DeleteUserFromWorkspace {
|
|
deleteUserFromWorkspace(workspaceMemberIdToDelete: "${WORKSPACE_MEMBER_DATA_SEED_IDS.JANE}") {
|
|
id
|
|
}
|
|
}
|
|
`,
|
|
};
|
|
|
|
await client
|
|
.post('/metadata')
|
|
.set('Authorization', `Bearer ${APPLE_JONY_MEMBER_ACCESS_TOKEN}`)
|
|
.send(query)
|
|
.expect(200)
|
|
.expect((res) => {
|
|
expect(res.body.data).toBeNull();
|
|
expect(res.body.errors).toBeDefined();
|
|
expect(res.body.errors[0].message).toBe(
|
|
PermissionsExceptionMessage.PERMISSION_DENIED,
|
|
);
|
|
expect(res.body.errors[0].extensions.code).toBe(ErrorCode.FORBIDDEN);
|
|
});
|
|
});
|
|
|
|
it('should soft delete user and remove workspace relations when deleting a user in their only workspace', async () => {
|
|
// 1. Arrange
|
|
// Enable public invite link to allow sign up without personal token
|
|
const enablePublicInviteLinkMutation = {
|
|
query: `
|
|
mutation updateWorkspace {
|
|
updateWorkspace(data: { isPublicInviteLinkEnabled: true }) {
|
|
id
|
|
isPublicInviteLinkEnabled
|
|
}
|
|
}
|
|
`,
|
|
};
|
|
|
|
await client
|
|
.post('/metadata')
|
|
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
|
|
.send(enablePublicInviteLinkMutation)
|
|
.expect(200)
|
|
.expect((res) => {
|
|
expect(res.body.errors).toBeUndefined();
|
|
expect(res.body.data.updateWorkspace.isPublicInviteLinkEnabled).toBe(
|
|
true,
|
|
);
|
|
});
|
|
|
|
// Sign up a new user into the current workspace via public invite link
|
|
const testEmail = `test_user_${Date.now()}@example.com`;
|
|
const signUpMutation = signUpOperationFactory({
|
|
email: testEmail,
|
|
password: 'Password123!',
|
|
});
|
|
|
|
const signUpResponse = await client.post('/metadata').send(signUpMutation);
|
|
|
|
expect(signUpResponse.status).toBe(200);
|
|
expect(signUpResponse.body.errors).toBeUndefined();
|
|
|
|
// Query workspace members and find the created user by email to get workspaceMemberId
|
|
const newWorkspaceMemberQuery = {
|
|
query: `
|
|
query WorkspaceMember($workspaceMemberFilter: WorkspaceMemberFilterInput!) {
|
|
workspaceMember(filter: $workspaceMemberFilter) {
|
|
id
|
|
userId
|
|
userWorkspaceId
|
|
}
|
|
}
|
|
`,
|
|
variables: {
|
|
workspaceMemberFilter: {
|
|
userEmail: {
|
|
eq: testEmail,
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
const newMemberResponse = await client
|
|
.post('/graphql')
|
|
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
|
|
.send(newWorkspaceMemberQuery);
|
|
|
|
expect(newMemberResponse.status).toBe(200);
|
|
|
|
const createdMember = newMemberResponse.body.data.workspaceMember;
|
|
|
|
expect(createdMember).toBeDefined();
|
|
const createdWorkspaceMemberId = createdMember.id;
|
|
|
|
// 2. Act
|
|
const deleteUserFromWorkspaceMutation = {
|
|
query: `
|
|
mutation DeleteUserFromWorkspace {
|
|
deleteUserFromWorkspace(workspaceMemberIdToDelete: "${createdWorkspaceMemberId}") {
|
|
id
|
|
}
|
|
}
|
|
`,
|
|
};
|
|
|
|
const deleteResponse = await client
|
|
.post('/metadata')
|
|
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
|
|
.send(deleteUserFromWorkspaceMutation);
|
|
|
|
expect(deleteResponse.status).toBe(200);
|
|
|
|
expect(deleteResponse.body.errors).toBeUndefined();
|
|
|
|
// 3. Assert
|
|
const membersAfterDeletionResponse = await client
|
|
.post('/graphql')
|
|
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
|
|
.send(newWorkspaceMemberQuery);
|
|
|
|
const createdMemberAfterDeletion =
|
|
membersAfterDeletionResponse.body.data.workspaceMember;
|
|
|
|
expect(createdMemberAfterDeletion).toBeNull();
|
|
|
|
const getRolesWithMembersQuery = {
|
|
query: `
|
|
query GetRoles {
|
|
getRoles { id label workspaceMembers { id } }
|
|
}
|
|
`,
|
|
};
|
|
|
|
const rolesResponse = await client
|
|
.post('/metadata')
|
|
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
|
|
.send(getRolesWithMembersQuery);
|
|
|
|
expect(rolesResponse.status).toBe(200);
|
|
|
|
expect(rolesResponse.body.errors).toBeUndefined();
|
|
const roles = rolesResponse.body.data.getRoles as Array<{
|
|
id: string;
|
|
workspaceMembers: Array<{ id: string }>;
|
|
}>;
|
|
|
|
for (const role of roles) {
|
|
expect(
|
|
role.workspaceMembers.find((wm) => wm.id === createdWorkspaceMemberId),
|
|
).toBeUndefined();
|
|
}
|
|
});
|
|
});
|