Skip to content

Commit 41a3fc1

Browse files
wesbillmanBrain
andauthored
fix(desktop): let channel members add members and bots without admin (#815)
Signed-off-by: Wes <[email protected]> Co-authored-by: Brain <21994759fc7a6fa6b965551d35cfd7897d262f2495467f2d78694ddcfa6a5c7e@sprout-oss.stage.blox.sqprod.co>
1 parent a25ca5d commit 41a3fc1

4 files changed

Lines changed: 80 additions & 2 deletions

File tree

‎desktop/src/features/channels/ui/ChannelMemberInviteCard.tsx‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@ function formatSearchUserSecondary(user: UserSearchResult) {
3535
}
3636

3737
export function ChannelMemberInviteCard({
38+
canAssignElevatedRoles,
3839
existingMembers,
3940
isPending,
4041
onSubmit,
4142
open,
4243
requestErrorMessage,
4344
}: {
45+
canAssignElevatedRoles: boolean;
4446
existingMembers: ChannelMember[];
4547
isPending: boolean;
4648
onSubmit: (input: {
@@ -63,6 +65,28 @@ export function ChannelMemberInviteCard({
6365
AddChannelMembersResult["errors"]
6466
>([]);
6567

68+
// Only owners/admins may grant the elevated "admin" role — the relay rejects
69+
// it for everyone else. Hide it from the dropdown so we never offer a role
70+
// the server will refuse. "member", "guest", and "bot" are non-elevated and
71+
// any channel member may grant them.
72+
const availableRoles = React.useMemo<
73+
Exclude<ChannelMember["role"], "owner">[]
74+
>(
75+
() =>
76+
canAssignElevatedRoles
77+
? ["member", "admin", "guest", "bot"]
78+
: ["member", "guest", "bot"],
79+
[canAssignElevatedRoles],
80+
);
81+
82+
// Guard against a stale elevated selection if the caller's permissions change
83+
// while the card is mounted (e.g. the member gets demoted).
84+
React.useEffect(() => {
85+
if (!availableRoles.includes(inviteRole)) {
86+
setInviteRole("member");
87+
}
88+
}, [availableRoles, inviteRole]);
89+
6690
const deferredInviteQuery = React.useDeferredValue(inviteQuery.trim());
6791
const selectedInviteePubkeys = React.useMemo(
6892
() =>
@@ -329,7 +353,7 @@ export function ChannelMemberInviteCard({
329353
}
330354
value={inviteRole}
331355
>
332-
{["member", "admin", "guest", "bot"].map((role) => (
356+
{availableRoles.map((role) => (
333357
<option key={role} value={role}>
334358
{role}
335359
</option>

‎desktop/src/features/channels/ui/MembersSidebar.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,10 @@ export function MembersSidebar({
228228
</SheetHeader>
229229

230230
<div className="flex-1 space-y-6 overflow-y-auto px-6 py-6">
231-
{(canManageMembers || channel.visibility === "open") &&
231+
{(selfMember !== null || channel.visibility === "open") &&
232232
channel.channelType !== "dm" ? (
233233
<ChannelMemberInviteCard
234+
canAssignElevatedRoles={canManageMembers}
234235
existingMembers={rawMembers}
235236
isPending={addMembersMutation.isPending}
236237
onSubmit={(input) => addMembersMutation.mutateAsync(input)}

‎desktop/src/testing/e2eBridge.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,31 @@ const mockChannels: MockChannel[] = [
10551055
createMockMember(MOCK_IDENTITY_PUBKEY, "guest", 700),
10561056
],
10571057
}),
1058+
createMockChannel({
1059+
id: "3c2d9f0a-1b44-5e77-9a21-6f8b0c4d2e91",
1060+
name: "secret-projects",
1061+
channel_type: "stream",
1062+
visibility: "private",
1063+
description: "Private project room",
1064+
topic: "Skunkworks",
1065+
purpose: "Coordinate confidential project work.",
1066+
last_message_at: null,
1067+
archived_at: null,
1068+
created_by: ALICE_PUBKEY,
1069+
topic_set_by: ALICE_PUBKEY,
1070+
topic_set_at: isoMinutesAgo(120),
1071+
purpose_set_by: ALICE_PUBKEY,
1072+
purpose_set_at: isoMinutesAgo(130),
1073+
topic_required: false,
1074+
max_members: null,
1075+
nip29_group_id: null,
1076+
created_minutes_ago: 600,
1077+
updated_minutes_ago: 120,
1078+
members: [
1079+
createMockMember(ALICE_PUBKEY, "owner", 600),
1080+
createMockMember(MOCK_IDENTITY_PUBKEY, "member", 540),
1081+
],
1082+
}),
10581083
createMockChannel({
10591084
id: "f48efb06-0c93-5025-aac9-2e646bb6bfa8",
10601085
name: "alice-tyler",

‎desktop/tests/e2e/channels.spec.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,34 @@ test("open-channel members can add agents from the header", async ({
872872
await expect(page.getByTestId("add-channel-bot-dialog-footer")).toBeVisible();
873873
});
874874

875+
test("private-channel members can add members and bots without admin", async ({
876+
page,
877+
}) => {
878+
await page.goto("/");
879+
// secret-projects is a private (non-DM) channel where the current user is a
880+
// plain member, not owner/admin. They should still be able to add members
881+
// and bots — only granting elevated roles is reserved for owners/admins.
882+
await openMembersSidebar(page, "secret-projects");
883+
884+
// The invite card is shown to any member, not just owners/admins.
885+
await expect(
886+
page.getByTestId("channel-management-search-users"),
887+
).toBeVisible();
888+
await expect(
889+
page.getByTestId("channel-management-add-members"),
890+
).toBeVisible();
891+
892+
// The role dropdown hides the elevated "admin" option for non-admins — the
893+
// relay rejects it anyway — while keeping the non-elevated roles a member
894+
// may grant (member, guest, bot).
895+
const roleSelect = page.getByTestId("channel-management-add-role");
896+
await expect(roleSelect.locator("option")).toHaveText([
897+
"member",
898+
"guest",
899+
"bot",
900+
]);
901+
});
902+
875903
test("removing a channel-scoped agent preserves the managed agent record", async ({
876904
page,
877905
}) => {

0 commit comments

Comments
 (0)