[permissions] forbid deletion of last admin user #10504
Open
+184
−95
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR implements protection against deleting the last admin user in a workspace, ensuring workspace continuity.
- Added new
NO_ROLE_FOUND_FOR_USER_WORKSPACEerror code inpermissions.exception.tsfor proper error handling - Implemented
validateUserWorkspaceIsNotUniqueAdminOrThrowmethod inuser-role.service.tsto check if a user is the last admin - Enhanced
deleteUsermethod inuser.service.tsto prevent deletion of the last admin with clear error messaging - Added
UserWorkspaceModuletoUserModuleimports to access necessary services for admin validation - Created integration test in
user.integration-spec.tsto verify the functionality works correctly
6 file(s) reviewed, 3 comment(s)
Edit PR Review Bot Settings | Greptile
Comment on lines
140
to
143
| public async validateUserWorkspaceIsNotUniqueAdminOrThrow({ | ||
| userWorkspaceId, | ||
| workspaceId, | ||
| }) { |
There was a problem hiding this comment.
style: Missing type definition for method parameters. Consider adding explicit types: { userWorkspaceId: string, workspaceId: string }
Suggested change
| public async validateUserWorkspaceIsNotUniqueAdminOrThrow({ | |
| userWorkspaceId, | |
| workspaceId, | |
| }) { | |
| public async validateUserWorkspaceIsNotUniqueAdminOrThrow({ | |
| userWorkspaceId, | |
| workspaceId, | |
| }: { userWorkspaceId: string; workspaceId: string }) { |
Comment on lines
222
to
225
| private async validateMoreThanOneWorkspaceMemberHasAdminRoleOrThrow({ | ||
| adminRoleId, | ||
| workspaceId, | ||
| }) { |
There was a problem hiding this comment.
style: Missing type definition for method parameters. Consider adding explicit types: { adminRoleId: string, workspaceId: string }
Suggested change
| private async validateMoreThanOneWorkspaceMemberHasAdminRoleOrThrow({ | |
| adminRoleId, | |
| workspaceId, | |
| }) { | |
| private async validateMoreThanOneWorkspaceMemberHasAdminRoleOrThrow({ | |
| adminRoleId, | |
| workspaceId, | |
| }: { adminRoleId: string; workspaceId: string }) { |
packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A user should not be able to delete their account if they are the last admin of a workspace.
It means that if a user wants to sign out of twenty, they should delete their workspace, not their account