WPB-21704 [fix] manage Channels via TM #4847
Merged
Conversation
This file contains hidden or 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
zebot
added
the
ok-to-test
battermann
changed the title
battermann
changed the title
battermann
force-pushed
the
WPB-20429-replace-the-members-of-a-channels-for-tm-fix
branch
from
c8243e2 to
c9ba2fd
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug where team admins received 403 errors when attempting to manage channels they were members of with conversation_role set to wire_member. The fix introduces a new ManageChannels permission that allows team admins/owners to manage channels regardless of their conversation role.
- Introduces a new
ManageChannelshidden permission for team owners and admins - Refactors permission checking logic to use
ActorContextinstead ofConvOrTeamMemberto properly handle both conversation and team member contexts - Updates all channel management operations (add, remove, replace members, rename, etc.) to respect the new permission
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| libs/wire-api/src/Wire/API/Team/Member.hs | Adds the ManageChannels hidden permission to the HiddenPerm enum and assigns it to owner/admin roles |
| services/galley/src/Galley/API/Util.hs | Replaces ensureChannelAndTeamAdmin with ensureManageChannelsPermission and refactors ConvOrTeamMember to ActorContext |
| services/galley/src/Galley/API/Action.hs | Updates permission checks to use ActorContext and adds channelAdminOverride logic to bypass conversation role checks for team admins with ManageChannels |
| services/galley/src/Galley/API/Update.hs | Introduces MLSCommitMode type, updates member operations to use new permission checks, and improves channel-specific removal logic |
| services/galley/src/Galley/API/Query.hs | Simplifies ensureConvAdmin to use the new hasManageChannelsPermission helper |
| services/galley/src/Galley/API/Public/Conversation.hs | Updates API endpoints to pass WithoutCommit mode to addMembers and replaceMembers |
| services/galley/test/integration/API.hs | Updates test expectation from InternalAdd to ExternalAdd to match new behavior |
| integration/test/Test/Channels.hs | Adds comprehensive integration test covering add, remove, and replace member operations for team admins managing channels |
| changelog.d/3-bug-fixes/WPB-21704 | Documents the bug fix in the changelog |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
blackheaven
approved these changes
Nov 11, 2025
stefanwire
approved these changes
Nov 12, 2025
determin join type by MLSCommitMode flag more test cases and fixes removed obsolete code fix old test ConvOrTeamMember with ActorContext add commet check ManageChannels permission instead of team member status
battermann
force-pushed
the
WPB-20429-replace-the-members-of-a-channels-for-tm-fix
branch
from
94a3e46 to
99f08df
Compare
battermann
deleted the
WPB-20429-replace-the-members-of-a-channels-for-tm-fix
branch
This was referenced Nov 26, 2025
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.
https://wearezeta.atlassian.net/browse/WPB-21704
Checklist
changelog.d