2021-02-16 01:19:02 +01:00
|
|
|
from typing import Sequence
|
2017-11-01 10:04:16 +01:00
|
|
|
|
2020-06-11 00:54:34 +02:00
|
|
|
from django.http import HttpRequest, HttpResponse
|
2021-04-16 00:57:30 +02:00
|
|
|
from django.utils.translation import gettext as _
|
2020-06-11 00:54:34 +02:00
|
|
|
|
2022-04-14 23:30:17 +02:00
|
|
|
from zerver.actions.user_groups import (
|
2022-03-02 11:58:37 +01:00
|
|
|
add_subgroups_to_user_group,
|
2020-06-11 00:54:34 +02:00
|
|
|
bulk_add_members_to_user_group,
|
|
|
|
check_add_user_group,
|
|
|
|
check_delete_user_group,
|
|
|
|
do_update_user_group_description,
|
|
|
|
do_update_user_group_name,
|
|
|
|
remove_members_from_user_group,
|
2022-03-02 11:58:37 +01:00
|
|
|
remove_subgroups_from_user_group,
|
2020-06-11 00:54:34 +02:00
|
|
|
)
|
2022-04-14 23:30:17 +02:00
|
|
|
from zerver.decorator import require_member_or_admin, require_user_group_edit_permission
|
2017-11-02 07:53:08 +01:00
|
|
|
from zerver.lib.exceptions import JsonableError
|
2020-06-11 00:54:34 +02:00
|
|
|
from zerver.lib.request import REQ, has_request_variables
|
2021-06-30 18:35:50 +02:00
|
|
|
from zerver.lib.response import json_success
|
2020-06-11 00:54:34 +02:00
|
|
|
from zerver.lib.user_groups import (
|
|
|
|
access_user_group_by_id,
|
2022-03-02 11:58:37 +01:00
|
|
|
access_user_groups_as_potential_subgroups,
|
2021-10-09 20:02:39 +02:00
|
|
|
get_direct_memberships_of_users,
|
2022-04-04 13:59:25 +02:00
|
|
|
get_subgroup_ids,
|
2022-04-27 11:59:25 +02:00
|
|
|
get_user_group_direct_member_ids,
|
2022-03-24 11:39:57 +01:00
|
|
|
get_user_group_member_ids,
|
2022-03-18 14:38:11 +01:00
|
|
|
is_user_in_group,
|
2020-06-11 00:54:34 +02:00
|
|
|
user_groups_in_realm_serialized,
|
|
|
|
)
|
2022-03-18 14:38:11 +01:00
|
|
|
from zerver.lib.users import access_user_by_id, user_ids_to_users
|
|
|
|
from zerver.lib.validator import check_bool, check_int, check_list
|
2019-02-02 23:53:22 +01:00
|
|
|
from zerver.models import UserProfile
|
2021-02-16 01:19:02 +01:00
|
|
|
from zerver.views.streams import compose_views
|
2020-06-11 00:54:34 +02:00
|
|
|
|
2017-11-01 10:04:16 +01:00
|
|
|
|
2019-11-16 15:56:40 +01:00
|
|
|
@require_user_group_edit_permission
|
2017-11-01 10:04:16 +01:00
|
|
|
@has_request_variables
|
2021-02-12 08:19:30 +01:00
|
|
|
def add_user_group(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
|
|
|
name: str = REQ(),
|
2021-04-07 22:00:44 +02:00
|
|
|
members: Sequence[int] = REQ(json_validator=check_list(check_int), default=[]),
|
2021-02-12 08:19:30 +01:00
|
|
|
description: str = REQ(),
|
|
|
|
) -> HttpResponse:
|
2017-11-01 10:04:16 +01:00
|
|
|
user_profiles = user_ids_to_users(members, user_profile.realm)
|
|
|
|
check_add_user_group(user_profile.realm, name, user_profiles, description)
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2017-11-02 07:53:08 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2019-06-18 16:43:22 +02:00
|
|
|
@require_member_or_admin
|
2018-08-16 02:44:51 +02:00
|
|
|
@has_request_variables
|
|
|
|
def get_user_group(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
|
|
|
|
user_groups = user_groups_in_realm_serialized(user_profile.realm)
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request, data={"user_groups": user_groups})
|
2018-08-16 02:44:51 +02:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2019-11-16 15:56:40 +01:00
|
|
|
@require_user_group_edit_permission
|
2017-11-02 07:53:08 +01:00
|
|
|
@has_request_variables
|
2021-02-12 08:19:30 +01:00
|
|
|
def edit_user_group(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
2021-04-07 22:00:44 +02:00
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
2021-02-12 08:19:30 +01:00
|
|
|
name: str = REQ(default=""),
|
|
|
|
description: str = REQ(default=""),
|
|
|
|
) -> HttpResponse:
|
2017-11-02 07:53:08 +01:00
|
|
|
if not (name or description):
|
2021-06-30 18:35:50 +02:00
|
|
|
raise JsonableError(_("No new data supplied"))
|
2017-11-02 07:53:08 +01:00
|
|
|
|
2018-02-19 13:38:18 +01:00
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile)
|
2017-11-02 07:53:08 +01:00
|
|
|
|
|
|
|
if name != user_group.name:
|
|
|
|
do_update_user_group_name(user_group, name)
|
|
|
|
|
|
|
|
if description != user_group.description:
|
|
|
|
do_update_user_group_description(user_group, description)
|
|
|
|
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2017-11-02 08:15:14 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2019-11-16 15:56:40 +01:00
|
|
|
@require_user_group_edit_permission
|
2017-11-02 08:15:14 +01:00
|
|
|
@has_request_variables
|
2021-02-12 08:19:30 +01:00
|
|
|
def delete_user_group(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
2021-04-07 22:00:44 +02:00
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
2021-02-12 08:19:30 +01:00
|
|
|
) -> HttpResponse:
|
2018-02-19 13:38:18 +01:00
|
|
|
|
|
|
|
check_delete_user_group(user_group_id, user_profile)
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2017-11-02 08:53:30 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2019-11-16 15:56:40 +01:00
|
|
|
@require_user_group_edit_permission
|
2017-11-02 08:53:30 +01:00
|
|
|
@has_request_variables
|
2021-02-12 08:19:30 +01:00
|
|
|
def update_user_group_backend(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
2021-04-07 22:00:44 +02:00
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
|
|
|
delete: Sequence[int] = REQ(json_validator=check_list(check_int), default=[]),
|
|
|
|
add: Sequence[int] = REQ(json_validator=check_list(check_int), default=[]),
|
2021-02-12 08:19:30 +01:00
|
|
|
) -> HttpResponse:
|
2017-11-02 08:53:30 +01:00
|
|
|
if not add and not delete:
|
2021-06-30 18:35:50 +02:00
|
|
|
raise JsonableError(_('Nothing to do. Specify at least one of "add" or "delete".'))
|
2017-11-02 08:53:30 +01:00
|
|
|
|
2021-02-16 01:19:02 +01:00
|
|
|
thunks = [
|
|
|
|
lambda: add_members_to_group_backend(
|
|
|
|
request, user_profile, user_group_id=user_group_id, members=add
|
|
|
|
),
|
|
|
|
lambda: remove_members_from_group_backend(
|
|
|
|
request, user_profile, user_group_id=user_group_id, members=delete
|
|
|
|
),
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
]
|
2022-01-31 15:27:58 +01:00
|
|
|
data = compose_views(thunks)
|
|
|
|
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request, data)
|
2017-11-02 08:53:30 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
|
|
|
def add_members_to_group_backend(
|
2021-02-16 01:19:02 +01:00
|
|
|
request: HttpRequest, user_profile: UserProfile, user_group_id: int, members: Sequence[int]
|
2021-02-12 08:19:30 +01:00
|
|
|
) -> HttpResponse:
|
2017-11-02 08:53:30 +01:00
|
|
|
if not members:
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2017-11-02 08:53:30 +01:00
|
|
|
|
2018-02-19 13:38:18 +01:00
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile)
|
2017-11-02 08:53:30 +01:00
|
|
|
user_profiles = user_ids_to_users(members, user_profile.realm)
|
2021-10-09 20:02:39 +02:00
|
|
|
existing_member_ids = set(get_direct_memberships_of_users(user_group, user_profiles))
|
2018-02-19 13:38:18 +01:00
|
|
|
|
2017-11-02 08:53:30 +01:00
|
|
|
for user_profile in user_profiles:
|
|
|
|
if user_profile.id in existing_member_ids:
|
2021-02-12 08:19:30 +01:00
|
|
|
raise JsonableError(
|
|
|
|
_("User {user_id} is already a member of this group").format(
|
|
|
|
user_id=user_profile.id,
|
|
|
|
)
|
|
|
|
)
|
2017-11-02 08:53:30 +01:00
|
|
|
|
2022-03-12 09:35:59 +01:00
|
|
|
user_profile_ids = [user.id for user in user_profiles]
|
|
|
|
bulk_add_members_to_user_group(user_group, user_profile_ids)
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2017-11-02 08:53:30 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
|
|
|
def remove_members_from_group_backend(
|
2021-02-16 01:19:02 +01:00
|
|
|
request: HttpRequest, user_profile: UserProfile, user_group_id: int, members: Sequence[int]
|
2021-02-12 08:19:30 +01:00
|
|
|
) -> HttpResponse:
|
2017-11-02 08:53:30 +01:00
|
|
|
if not members:
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2017-11-02 08:53:30 +01:00
|
|
|
|
|
|
|
user_profiles = user_ids_to_users(members, user_profile.realm)
|
2018-02-19 13:38:18 +01:00
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile)
|
2022-04-27 11:59:25 +02:00
|
|
|
group_member_ids = get_user_group_direct_member_ids(user_group)
|
2018-02-19 13:38:18 +01:00
|
|
|
for member in members:
|
2021-02-12 08:19:30 +01:00
|
|
|
if member not in group_member_ids:
|
2020-06-15 23:22:24 +02:00
|
|
|
raise JsonableError(_("There is no member '{}' in this user group").format(member))
|
2018-02-19 13:38:18 +01:00
|
|
|
|
2022-03-12 09:44:14 +01:00
|
|
|
user_profile_ids = [user.id for user in user_profiles]
|
|
|
|
remove_members_from_user_group(user_group, user_profile_ids)
|
2022-01-31 13:44:02 +01:00
|
|
|
return json_success(request)
|
2022-03-02 11:58:37 +01:00
|
|
|
|
|
|
|
|
|
|
|
def add_subgroups_to_group_backend(
|
|
|
|
request: HttpRequest, user_profile: UserProfile, user_group_id: int, subgroup_ids: Sequence[int]
|
|
|
|
) -> HttpResponse:
|
|
|
|
if not subgroup_ids:
|
|
|
|
return json_success(request)
|
|
|
|
|
|
|
|
subgroups = access_user_groups_as_potential_subgroups(subgroup_ids, user_profile)
|
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile)
|
|
|
|
existing_subgroups = user_group.direct_subgroups.all().values_list("id", flat=True)
|
|
|
|
for group in subgroups:
|
|
|
|
if group.id in existing_subgroups:
|
|
|
|
raise JsonableError(
|
|
|
|
_("User group {group_id} is already a subgroup of this group.").format(
|
|
|
|
group_id=group.id
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
add_subgroups_to_user_group(user_group, subgroups)
|
|
|
|
return json_success(request)
|
|
|
|
|
|
|
|
|
|
|
|
def remove_subgroups_from_group_backend(
|
|
|
|
request: HttpRequest, user_profile: UserProfile, user_group_id: int, subgroup_ids: Sequence[int]
|
|
|
|
) -> HttpResponse:
|
|
|
|
if not subgroup_ids:
|
|
|
|
return json_success(request)
|
|
|
|
|
|
|
|
subgroups = access_user_groups_as_potential_subgroups(subgroup_ids, user_profile)
|
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile)
|
|
|
|
existing_subgroups = user_group.direct_subgroups.all().values_list("id", flat=True)
|
|
|
|
for group in subgroups:
|
|
|
|
if group.id not in existing_subgroups:
|
|
|
|
raise JsonableError(
|
|
|
|
_("User group {group_id} is not a subgroup of this group.").format(
|
|
|
|
group_id=group.id
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
remove_subgroups_from_user_group(user_group, subgroups)
|
|
|
|
return json_success(request)
|
|
|
|
|
|
|
|
|
|
|
|
@require_user_group_edit_permission
|
|
|
|
@has_request_variables
|
|
|
|
def update_subgroups_of_user_group(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
|
|
|
delete: Sequence[int] = REQ(json_validator=check_list(check_int), default=[]),
|
|
|
|
add: Sequence[int] = REQ(json_validator=check_list(check_int), default=[]),
|
|
|
|
) -> HttpResponse:
|
|
|
|
if not add and not delete:
|
|
|
|
raise JsonableError(_('Nothing to do. Specify at least one of "add" or "delete".'))
|
|
|
|
|
|
|
|
thunks = [
|
|
|
|
lambda: add_subgroups_to_group_backend(
|
|
|
|
request, user_profile, user_group_id=user_group_id, subgroup_ids=add
|
|
|
|
),
|
|
|
|
lambda: remove_subgroups_from_group_backend(
|
|
|
|
request, user_profile, user_group_id=user_group_id, subgroup_ids=delete
|
|
|
|
),
|
|
|
|
]
|
|
|
|
data = compose_views(thunks)
|
|
|
|
|
|
|
|
return json_success(request, data)
|
2022-03-18 14:38:11 +01:00
|
|
|
|
|
|
|
|
|
|
|
@require_member_or_admin
|
|
|
|
@has_request_variables
|
|
|
|
def get_is_user_group_member(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
|
|
|
user_id: int = REQ(json_validator=check_int, path_only=True),
|
|
|
|
direct_member_only: bool = REQ(json_validator=check_bool, default=False),
|
|
|
|
) -> HttpResponse:
|
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile, for_read=True)
|
|
|
|
target_user = access_user_by_id(user_profile, user_id, for_admin=False)
|
|
|
|
|
|
|
|
return json_success(
|
|
|
|
request,
|
|
|
|
data={
|
|
|
|
"is_user_group_member": is_user_in_group(
|
|
|
|
user_group, target_user, direct_member_only=direct_member_only
|
|
|
|
)
|
|
|
|
},
|
|
|
|
)
|
2022-03-24 11:39:57 +01:00
|
|
|
|
|
|
|
|
|
|
|
@require_member_or_admin
|
|
|
|
@has_request_variables
|
|
|
|
def get_user_group_members(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
|
|
|
direct_member_only: bool = REQ(json_validator=check_bool, default=False),
|
|
|
|
) -> HttpResponse:
|
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile, for_read=True)
|
|
|
|
|
|
|
|
return json_success(
|
|
|
|
request,
|
|
|
|
data={
|
|
|
|
"members": get_user_group_member_ids(user_group, direct_member_only=direct_member_only)
|
|
|
|
},
|
|
|
|
)
|
2022-04-04 13:59:25 +02:00
|
|
|
|
|
|
|
|
|
|
|
@require_member_or_admin
|
|
|
|
@has_request_variables
|
|
|
|
def get_subgroups_of_user_group(
|
|
|
|
request: HttpRequest,
|
|
|
|
user_profile: UserProfile,
|
|
|
|
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
|
|
|
direct_subgroup_only: bool = REQ(json_validator=check_bool, default=False),
|
|
|
|
) -> HttpResponse:
|
|
|
|
user_group = access_user_group_by_id(user_group_id, user_profile, for_read=True)
|
|
|
|
|
|
|
|
return json_success(
|
|
|
|
request,
|
|
|
|
data={"subgroups": get_subgroup_ids(user_group, direct_subgroup_only=direct_subgroup_only)},
|
|
|
|
)
|