diff --git a/zerver/views/realm_aliases.py b/zerver/views/realm_domains.py similarity index 68% rename from zerver/views/realm_aliases.py rename to zerver/views/realm_domains.py index bfabad68bf..332e048bbc 100644 --- a/zerver/views/realm_aliases.py +++ b/zerver/views/realm_domains.py @@ -14,14 +14,14 @@ from zerver.models import can_add_realm_domain, RealmDomain, UserProfile from typing import Text -def list_aliases(request, user_profile): +def list_realm_domains(request, user_profile): # type: (HttpRequest, UserProfile) -> (HttpResponse) - aliases = get_realm_domains(user_profile.realm) - return json_success({'domains': aliases}) + domains = get_realm_domains(user_profile.realm) + return json_success({'domains': domains}) @require_realm_admin @has_request_variables -def create_alias(request, user_profile, domain=REQ(validator=check_string), allow_subdomains=REQ(validator=check_bool)): +def create_realm_domain(request, user_profile, domain=REQ(validator=check_string), allow_subdomains=REQ(validator=check_bool)): # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse) domain = domain.strip().lower() try: @@ -32,27 +32,27 @@ def create_alias(request, user_profile, domain=REQ(validator=check_string), allo return json_error(_("The domain %(domain)s is already a part of your organization.") % {'domain': domain}) if not can_add_realm_domain(domain): return json_error(_("The domain %(domain)s belongs to another organization.") % {'domain': domain}) - alias = do_add_realm_domain(user_profile.realm, domain, allow_subdomains) - return json_success({'new_domain': [alias.id, alias.domain]}) + realm_domain = do_add_realm_domain(user_profile.realm, domain, allow_subdomains) + return json_success({'new_domain': [realm_domain.id, realm_domain.domain]}) @require_realm_admin @has_request_variables -def patch_alias(request, user_profile, domain, allow_subdomains=REQ(validator=check_bool)): +def patch_realm_domain(request, user_profile, domain, allow_subdomains=REQ(validator=check_bool)): # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse) try: - alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) - do_change_realm_domain(alias, allow_subdomains) + realm_domain = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) + do_change_realm_domain(realm_domain, allow_subdomains) except RealmDomain.DoesNotExist: return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_success() @require_realm_admin @has_request_variables -def delete_alias(request, user_profile, domain): +def delete_realm_domain(request, user_profile, domain): # type: (HttpRequest, UserProfile, Text) -> (HttpResponse) try: - alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) - do_remove_realm_domain(alias) + realm_domain = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) + do_remove_realm_domain(realm_domain) except RealmDomain.DoesNotExist: return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_success() diff --git a/zproject/urls.py b/zproject/urls.py index 30edc235ca..e04b08d4f7 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -172,13 +172,13 @@ v1_api_and_json_patterns = [ # Returns a 204, used by desktop app to verify connectivity status url(r'generate_204$', zerver.views.registration.generate_204, name='zerver.views.registration.generate_204'), - # realm/domains -> zerver.views.realm_aliases + # realm/domains -> zerver.views.realm_domains url(r'^realm/domains$', rest_dispatch, - {'GET': 'zerver.views.realm_aliases.list_aliases', - 'POST': 'zerver.views.realm_aliases.create_alias'}), + {'GET': 'zerver.views.realm_domains.list_realm_domains', + 'POST': 'zerver.views.realm_domains.create_realm_domain'}), url(r'^realm/domains/(?P\S+)$', rest_dispatch, - {'PATCH': 'zerver.views.realm_aliases.patch_alias', - 'DELETE': 'zerver.views.realm_aliases.delete_alias'}), + {'PATCH': 'zerver.views.realm_domains.patch_realm_domain', + 'DELETE': 'zerver.views.realm_domains.delete_realm_domain'}), # realm/emoji -> zerver.views.realm_emoji url(r'^realm/emoji$', rest_dispatch,