mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 22:13:26 +00:00
user_groups: Update code to check whether user can edit a user group.
Earlier there was only a realm level setting for configuring who can edit user groups. A new group level setting is also added for configuring who can manage that particular group. Now, a user group can be edited by a user if it is allowed from realm level setting or group level setting. This commit make changes in frontend to also use group level setting in determining whether a group can be edited by user or not and disables changing the group settings when group cannot be edited by user.
This commit is contained in:
@@ -162,7 +162,7 @@ export function user_can_move_messages_between_streams(): boolean {
|
|||||||
return user_has_permission(realm.realm_move_messages_between_streams_policy);
|
return user_has_permission(realm.realm_move_messages_between_streams_policy);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function user_can_edit_user_groups(): boolean {
|
export function user_can_edit_all_user_groups(): boolean {
|
||||||
return user_has_permission(realm.realm_user_group_edit_policy);
|
return user_has_permission(realm.realm_user_group_edit_policy);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,18 +171,22 @@ export function can_edit_user_group(group_id: number): boolean {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!user_can_edit_user_groups()) {
|
let can_edit_all_user_groups = user_can_edit_all_user_groups();
|
||||||
return false;
|
|
||||||
|
if (
|
||||||
|
!current_user.is_admin &&
|
||||||
|
!current_user.is_moderator &&
|
||||||
|
!user_groups.is_direct_member_of(current_user.user_id, group_id)
|
||||||
|
) {
|
||||||
|
can_edit_all_user_groups = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Admins and moderators are allowed to edit user groups even if they
|
if (can_edit_all_user_groups) {
|
||||||
// are not a member of that user group. Members can edit user groups
|
|
||||||
// only if they belong to that group.
|
|
||||||
if (current_user.is_admin || current_user.is_moderator) {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return user_groups.is_direct_member_of(current_user.user_id, group_id);
|
const group = user_groups.get_user_group_from_id(group_id);
|
||||||
|
return user_groups.is_user_in_group(group.can_manage_group, current_user.user_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function user_can_create_user_groups(): boolean {
|
export function user_can_create_user_groups(): boolean {
|
||||||
|
|||||||
@@ -162,9 +162,9 @@ test_policy(
|
|||||||
settings_data.user_can_create_user_groups,
|
settings_data.user_can_create_user_groups,
|
||||||
);
|
);
|
||||||
test_policy(
|
test_policy(
|
||||||
"user_can_edit_user_groups",
|
"user_can_edit_all_user_groups",
|
||||||
"realm_user_group_edit_policy",
|
"realm_user_group_edit_policy",
|
||||||
settings_data.user_can_edit_user_groups,
|
settings_data.user_can_edit_all_user_groups,
|
||||||
);
|
);
|
||||||
test_policy(
|
test_policy(
|
||||||
"user_can_add_custom_emoji",
|
"user_can_add_custom_emoji",
|
||||||
@@ -335,36 +335,96 @@ run_test("user_can_create_multiuse_invite", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
run_test("can_edit_user_group", () => {
|
run_test("can_edit_user_group", () => {
|
||||||
|
const admins = {
|
||||||
|
description: "Administrators",
|
||||||
|
name: "role:administrators",
|
||||||
|
id: 1,
|
||||||
|
members: new Set([1]),
|
||||||
|
is_system_group: true,
|
||||||
|
direct_subgroup_ids: new Set([]),
|
||||||
|
can_manage_group: 4,
|
||||||
|
can_mention_group: 1,
|
||||||
|
};
|
||||||
|
const moderators = {
|
||||||
|
description: "Moderators",
|
||||||
|
name: "role:moderators",
|
||||||
|
id: 2,
|
||||||
|
members: new Set([2]),
|
||||||
|
is_system_group: true,
|
||||||
|
direct_subgroup_ids: new Set([1]),
|
||||||
|
can_manage_group: 4,
|
||||||
|
can_mention_group: 1,
|
||||||
|
};
|
||||||
|
const members = {
|
||||||
|
description: "Members",
|
||||||
|
name: "role:members",
|
||||||
|
id: 3,
|
||||||
|
members: new Set([3]),
|
||||||
|
is_system_group: true,
|
||||||
|
direct_subgroup_ids: new Set([1, 2]),
|
||||||
|
can_manage_group: 4,
|
||||||
|
can_mention_group: 4,
|
||||||
|
};
|
||||||
|
const nobody = {
|
||||||
|
description: "Nobody",
|
||||||
|
name: "role:nobody",
|
||||||
|
id: 4,
|
||||||
|
members: new Set([]),
|
||||||
|
is_system_group: true,
|
||||||
|
direct_subgroup_ids: new Set([]),
|
||||||
|
can_manage_group: 4,
|
||||||
|
can_mention_group: 2,
|
||||||
|
};
|
||||||
const students = {
|
const students = {
|
||||||
description: "Students group",
|
description: "Students group",
|
||||||
name: "Students",
|
name: "Students",
|
||||||
id: 0,
|
id: 5,
|
||||||
members: new Set([1, 2]),
|
members: new Set([1, 2]),
|
||||||
is_system_group: false,
|
is_system_group: false,
|
||||||
direct_subgroup_ids: new Set([4, 5]),
|
direct_subgroup_ids: new Set([4, 5]),
|
||||||
can_mention_group: 2,
|
can_manage_group: 4,
|
||||||
|
can_mention_group: 3,
|
||||||
};
|
};
|
||||||
user_groups.initialize({
|
user_groups.initialize({
|
||||||
realm_user_groups: [students],
|
realm_user_groups: [admins, moderators, members, nobody, students],
|
||||||
});
|
});
|
||||||
|
|
||||||
page_params.is_spectator = true;
|
page_params.is_spectator = true;
|
||||||
assert.ok(!settings_data.can_edit_user_group(students.id));
|
assert.ok(!settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
page_params.is_spectator = false;
|
page_params.is_spectator = false;
|
||||||
|
realm.realm_user_group_edit_policy = settings_config.common_policy_values.by_admins_only.code;
|
||||||
current_user.user_id = 3;
|
current_user.user_id = 3;
|
||||||
current_user.is_guest = true;
|
|
||||||
assert.ok(!settings_data.can_edit_user_group(students.id));
|
assert.ok(!settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
current_user.is_guest = false;
|
current_user.is_admin = true;
|
||||||
current_user.is_moderator = true;
|
|
||||||
assert.ok(settings_data.can_edit_user_group(students.id));
|
assert.ok(settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
|
current_user.is_admin = false;
|
||||||
|
current_user.is_moderator = true;
|
||||||
|
assert.ok(!settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
|
realm.realm_user_group_edit_policy = settings_config.common_policy_values.by_members.code;
|
||||||
current_user.is_moderator = false;
|
current_user.is_moderator = false;
|
||||||
|
current_user.is_guest = false;
|
||||||
assert.ok(!settings_data.can_edit_user_group(students.id));
|
assert.ok(!settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
current_user.user_id = 2;
|
current_user.user_id = 2;
|
||||||
realm.realm_waiting_period_threshold = 0;
|
assert.ok(settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
|
realm.realm_user_group_edit_policy = settings_config.common_policy_values.by_admins_only.code;
|
||||||
|
assert.ok(!settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
|
const event = {
|
||||||
|
group_id: students.id,
|
||||||
|
data: {
|
||||||
|
can_manage_group: members.id,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
user_groups.update(event);
|
||||||
|
assert.ok(settings_data.can_edit_user_group(students.id));
|
||||||
|
|
||||||
|
current_user.user_id = 3;
|
||||||
assert.ok(settings_data.can_edit_user_group(students.id));
|
assert.ok(settings_data.can_edit_user_group(students.id));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user