diff --git a/docs/conversion.md b/docs/conversion.md index 844c89421b..e408e730e9 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -63,7 +63,7 @@ that we process them in `do_export_realm()`: #### Public Realm Data -`Realm/RealmAlias/RealmEmoji/RealmFilter/DefaultStream`. +`Realm/RealmDomain/RealmEmoji/RealmFilter/DefaultStream`. #### Cross Realm Data @@ -261,7 +261,7 @@ We have code in place to exclude `password` and `api_key` from ### Public Realm Data -- models: `Realm/RealmAlias/RealmEmoji/RealmFilter/DefaultStream` +- models: `Realm/RealmDomain/RealmEmoji/RealmFilter/DefaultStream` - asserts: `realm.json` All of these tables are public (per-realm), and they are keyed by diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 90efb48fb5..4234772771 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -28,7 +28,7 @@ from zerver.lib.message import ( render_markdown, ) from zerver.lib.realm_icon import realm_icon_url -from zerver.models import Realm, RealmEmoji, Stream, UserProfile, UserActivity, RealmAlias, \ +from zerver.models import Realm, RealmEmoji, Stream, UserProfile, UserActivity, RealmDomain, \ Subscription, Recipient, Message, Attachment, UserMessage, RealmAuditLog, UserHotspot, \ Client, DefaultStream, UserPresence, Referral, PushDeviceToken, MAX_SUBJECT_LENGTH, \ MAX_MESSAGE_LENGTH, get_client, get_stream, get_recipient, get_huddle, \ @@ -3219,12 +3219,12 @@ def get_emails_from_user_ids(user_ids): def get_realm_aliases(realm): # type: (Realm) -> List[Dict[str, Text]] - return list(realm.realmalias_set.values('domain', 'allow_subdomains')) + return list(realm.realmdomain_set.values('domain', 'allow_subdomains')) def do_add_realm_alias(realm, domain, allow_subdomains): - # type: (Realm, Text, bool) -> (RealmAlias) - alias = RealmAlias.objects.create(realm=realm, domain=domain, - allow_subdomains=allow_subdomains) + # type: (Realm, Text, bool) -> (RealmDomain) + alias = RealmDomain.objects.create(realm=realm, domain=domain, + allow_subdomains=allow_subdomains) event = dict(type="realm_domains", op="add", alias=dict(domain=alias.domain, allow_subdomains=alias.allow_subdomains)) @@ -3232,7 +3232,7 @@ def do_add_realm_alias(realm, domain, allow_subdomains): return alias def do_change_realm_alias(alias, allow_subdomains): - # type: (RealmAlias, bool) -> None + # type: (RealmDomain, bool) -> None alias.allow_subdomains = allow_subdomains alias.save(update_fields=['allow_subdomains']) event = dict(type="realm_domains", op="change", @@ -3241,11 +3241,11 @@ def do_change_realm_alias(alias, allow_subdomains): send_event(event, active_user_ids(alias.realm)) def do_remove_realm_alias(alias): - # type: (RealmAlias) -> None + # type: (RealmDomain) -> None realm = alias.realm domain = alias.domain alias.delete() - if RealmAlias.objects.filter(realm=realm).count() == 0 and realm.restricted_to_domain: + if RealmDomain.objects.filter(realm=realm).count() == 0 and realm.restricted_to_domain: # If this was the last realm alias, we mark the realm as no # longer restricted to domain, because the feature doesn't do # anything if there are no domains, and this is probably less diff --git a/zerver/lib/export.py b/zerver/lib/export.py index aa5432eaea..b697cc6e35 100644 --- a/zerver/lib/export.py +++ b/zerver/lib/export.py @@ -19,7 +19,7 @@ from zerver.lib.avatar_hash import user_avatar_hash from zerver.lib.create_user import random_api_key from zerver.models import UserProfile, Realm, Client, Huddle, Stream, \ UserMessage, Subscription, Message, RealmEmoji, RealmFilter, \ - RealmAlias, Recipient, DefaultStream, get_user_profile_by_id, \ + RealmDomain, Recipient, DefaultStream, get_user_profile_by_id, \ UserPresence, UserActivity, UserActivityInterval, get_user_profile_by_email, \ get_display_recipient, Attachment from zerver.lib.parallel import run_parallel @@ -54,7 +54,7 @@ MessageOutput = Dict[str, Any] realm_tables = [("zerver_defaultstream", DefaultStream), ("zerver_realmemoji", RealmEmoji), - ("zerver_realmalias", RealmAlias), + ("zerver_realmdomain", RealmDomain), ("zerver_realmfilter", RealmFilter)] # List[Tuple[TableName, Any]] @@ -70,7 +70,7 @@ ALL_ZERVER_TABLES = [ 'zerver_preregistrationuser_streams', 'zerver_pushdevicetoken', 'zerver_realm', - 'zerver_realmalias', + 'zerver_realmdomain', 'zerver_realmemoji', 'zerver_realmfilter', 'zerver_recipient', @@ -386,8 +386,8 @@ def get_realm_config(): ) Config( - table='zerver_realmalias', - model=RealmAlias, + table='zerver_realmdomain', + model=RealmDomain, normal_parent=realm_config, parent_key='realm_id__in', ) diff --git a/zerver/management/commands/create_realm.py b/zerver/management/commands/create_realm.py index 1c273bb4b5..993e2520ed 100644 --- a/zerver/management/commands/create_realm.py +++ b/zerver/management/commands/create_realm.py @@ -8,7 +8,7 @@ from django.conf import settings from django.core.exceptions import ValidationError from django.core.management.base import BaseCommand, CommandParser from zerver.lib.actions import Realm, do_create_realm, set_default_streams -from zerver.models import RealmAlias, can_add_alias, get_realm +from zerver.models import RealmDomain, can_add_alias, get_realm import re import sys diff --git a/zerver/management/commands/import.py b/zerver/management/commands/import.py index 61253f5ef0..50ad66d093 100644 --- a/zerver/management/commands/import.py +++ b/zerver/management/commands/import.py @@ -9,7 +9,7 @@ from django.db import connection from django.conf import settings from zerver.models import Realm, Stream, UserProfile, Recipient, Subscription, \ - Message, UserMessage, Huddle, DefaultStream, RealmAlias, RealmFilter, Client + Message, UserMessage, Huddle, DefaultStream, RealmDomain, RealmFilter, Client from zerver.lib.export import do_import_realm import os @@ -59,7 +59,7 @@ Usage: ./manage.py import [--destroy-rebuild-database] [--import-into-nonempty] def handle(self, *args, **options): # type: (*Any, **Any) -> None models_to_import = [Realm, Stream, UserProfile, Recipient, Subscription, - Client, Message, UserMessage, Huddle, DefaultStream, RealmAlias, + Client, Message, UserMessage, Huddle, DefaultStream, RealmDomain, RealmFilter] if len(args) == 0: diff --git a/zerver/management/commands/realm_alias.py b/zerver/management/commands/realm_alias.py index a399d40d29..bd25978ca6 100644 --- a/zerver/management/commands/realm_alias.py +++ b/zerver/management/commands/realm_alias.py @@ -9,7 +9,7 @@ from django.core.management.base import BaseCommand from django.db.utils import IntegrityError from django.utils.translation import ugettext as _ from zerver.models import get_realm, can_add_alias, \ - Realm, RealmAlias + Realm, RealmDomain from zerver.lib.actions import get_realm_aliases from zerver.lib.domains import validate_domain import sys @@ -60,17 +60,17 @@ class Command(BaseCommand): if not can_add_alias(domain): print(_("The domain %(domain)s belongs to another organization.") % {'domain': domain}) sys.exit(1) - RealmAlias.objects.create(realm=realm, domain=domain, - allow_subdomains=options["allow_subdomains"]) + RealmDomain.objects.create(realm=realm, domain=domain, + allow_subdomains=options["allow_subdomains"]) sys.exit(0) except IntegrityError: print(_("The domain %(domain)s is already a part of your organization.") % {'domain': domain}) sys.exit(1) elif options["op"] == "remove": try: - RealmAlias.objects.get(realm=realm, domain=domain).delete() + RealmDomain.objects.get(realm=realm, domain=domain).delete() sys.exit(0) - except RealmAlias.DoesNotExist: + except RealmDomain.DoesNotExist: print("No such entry found!") sys.exit(1) else: diff --git a/zerver/migrations/0071_rename_realmalias_to_realmdomain.py b/zerver/migrations/0071_rename_realmalias_to_realmdomain.py new file mode 100644 index 0000000000..ca6f6bc7e6 --- /dev/null +++ b/zerver/migrations/0071_rename_realmalias_to_realmdomain.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-03-31 14:21 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('zerver', '0070_userhotspot'), + ] + + operations = [ + migrations.RenameModel( + old_name='RealmAlias', + new_name='RealmDomain', + ), + ] diff --git a/zerver/models.py b/zerver/models.py index a9a6314240..b32aeedc81 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -270,7 +270,7 @@ def get_realm(string_id): def completely_open(realm): # type: (Realm) -> bool # This realm is completely open to everyone on the internet to - # join. E-mail addresses do not need to match a realmalias and + # join. E-mail addresses do not need to match a realmdomain and # an invite from an existing user is not required. if not realm: return False @@ -300,7 +300,7 @@ def name_changes_disabled(realm): return settings.NAME_CHANGES_DISABLED return settings.NAME_CHANGES_DISABLED or realm.name_changes_disabled -class RealmAlias(models.Model): +class RealmDomain(models.Model): realm = models.ForeignKey(Realm) # type: Realm # should always be stored lowercase domain = models.CharField(max_length=80, db_index=True) # type: Text @@ -313,7 +313,7 @@ def can_add_alias(domain): # type: (Text) -> bool if settings.REALMS_HAVE_SUBDOMAINS: return True - if RealmAlias.objects.filter(domain=domain).exists(): + if RealmDomain.objects.filter(domain=domain).exists(): return False return True @@ -341,7 +341,7 @@ def get_realm_by_email_domain(email): raise GetRealmByDomainException( "Cannot get realm from email domain when settings.REALMS_HAVE_SUBDOMAINS = True") domain = email_to_domain(email) - query = RealmAlias.objects.select_related('realm') + query = RealmDomain.objects.select_related('realm') # Search for the longest match. If found return immediately. Since in case of # settings.REALMS_HAVE_SUBDOMAINS=True, we have a unique mapping between the # realm and domain so don't worry about `allow_subdomains` being True or False. @@ -369,7 +369,7 @@ def email_allowed_for_realm(email, realm): if not realm.restricted_to_domain: return True domain = email_to_domain(email) - query = RealmAlias.objects.filter(realm=realm) + query = RealmDomain.objects.filter(realm=realm) if query.filter(domain=domain).exists(): return True else: @@ -382,7 +382,7 @@ def email_allowed_for_realm(email, realm): def list_of_domains_for_realm(realm): # type: (Realm) -> List[Dict[str, Union[str, bool]]] - return list(RealmAlias.objects.filter(realm=realm).values('domain', 'allow_subdomains')) + return list(RealmDomain.objects.filter(realm=realm).values('domain', 'allow_subdomains')) class RealmEmoji(ModelReprMixin, models.Model): author = models.ForeignKey('UserProfile', blank=True, null=True) diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 49ff41966e..e2093003a3 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -12,7 +12,7 @@ from django.utils import timezone from zerver.models import ( get_client, get_realm, get_recipient, get_stream, get_user_profile_by_email, - Message, RealmAlias, Recipient, UserMessage, UserPresence, UserProfile + Message, RealmDomain, Recipient, UserMessage, UserPresence, UserProfile ) from zerver.lib.actions import ( @@ -1155,7 +1155,7 @@ class EventsRegisterTest(ZulipTestCase): ('allow_subdomains', equals(True)), ])), ]) - alias = RealmAlias.objects.get(realm=realm, domain='zulip.org') + alias = RealmDomain.objects.get(realm=realm, domain='zulip.org') events = self.do_test(lambda: do_change_realm_alias(alias, True)) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index 918de20cb4..2a2e6c15fa 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -30,7 +30,7 @@ from zerver.lib.test_classes import ( from zerver.models import ( MAX_MESSAGE_LENGTH, MAX_SUBJECT_LENGTH, - Message, Realm, Recipient, Stream, UserMessage, UserProfile, Attachment, RealmAlias, + Message, Realm, Recipient, Stream, UserMessage, UserProfile, Attachment, RealmDomain, get_realm, get_stream, get_user_profile_by_email, Reaction, sew_messages_and_reactions ) @@ -149,7 +149,7 @@ class TestCrossRealmPMs(ZulipTestCase): def make_realm(self, domain): # type: (Text) -> Realm realm = Realm.objects.create(string_id=domain, invite_required=False) - RealmAlias.objects.create(realm=realm, domain=domain) + RealmDomain.objects.create(realm=realm, domain=domain) return realm def setUp(self): diff --git a/zerver/tests/test_realm_aliases.py b/zerver/tests/test_realm_aliases.py index 6ea9d5f0dd..98515ba07d 100644 --- a/zerver/tests/test_realm_aliases.py +++ b/zerver/tests/test_realm_aliases.py @@ -12,17 +12,17 @@ from zerver.lib.domains import validate_domain from zerver.lib.test_classes import ZulipTestCase from zerver.models import email_allowed_for_realm, get_realm, \ get_realm_by_email_domain, get_user_profile_by_email, \ - GetRealmByDomainException, RealmAlias + GetRealmByDomainException, RealmDomain import ujson -class RealmAliasTest(ZulipTestCase): +class RealmDomainTest(ZulipTestCase): def test_list_aliases(self): # type: () -> None self.login("iago@zulip.com") realm = get_realm('zulip') - RealmAlias.objects.create(realm=realm, domain='acme.com', allow_subdomains=True) + RealmDomain.objects.create(realm=realm, domain='acme.com', allow_subdomains=True) result = self.client_get("/json/realm/domains") self.assert_json_success(result) received = ujson.dumps(ujson.loads(result.content)['domains'], sort_keys=True) @@ -53,8 +53,8 @@ class RealmAliasTest(ZulipTestCase): result = self.client_post("/json/realm/domains", info=data) self.assert_json_success(result) realm = get_realm('zulip') - self.assertTrue(RealmAlias.objects.filter(realm=realm, domain='acme.com', - allow_subdomains=True).exists()) + self.assertTrue(RealmDomain.objects.filter(realm=realm, domain='acme.com', + allow_subdomains=True).exists()) result = self.client_post("/json/realm/domains", info=data) self.assert_json_error(result, 'The domain acme.com is already a part of your organization.') @@ -73,16 +73,16 @@ class RealmAliasTest(ZulipTestCase): # type: () -> None self.login("iago@zulip.com") realm = get_realm('zulip') - RealmAlias.objects.create(realm=realm, domain='acme.com', - allow_subdomains=False) + RealmDomain.objects.create(realm=realm, domain='acme.com', + allow_subdomains=False) data = { 'allow_subdomains': ujson.dumps(True), } url = "/json/realm/domains/acme.com" result = self.client_patch(url, data) self.assert_json_success(result) - self.assertTrue(RealmAlias.objects.filter(realm=realm, domain='acme.com', - allow_subdomains=True).exists()) + self.assertTrue(RealmDomain.objects.filter(realm=realm, domain='acme.com', + allow_subdomains=True).exists()) url = "/json/realm/domains/non-existent.com" result = self.client_patch(url, data) @@ -93,21 +93,21 @@ class RealmAliasTest(ZulipTestCase): # type: () -> None self.login("iago@zulip.com") realm = get_realm('zulip') - RealmAlias.objects.create(realm=realm, domain='acme.com') + RealmDomain.objects.create(realm=realm, domain='acme.com') result = self.client_delete("/json/realm/domains/non-existent.com") self.assertEqual(result.status_code, 400) self.assert_json_error(result, 'No entry found for domain non-existent.com.') result = self.client_delete("/json/realm/domains/acme.com") self.assert_json_success(result) - self.assertFalse(RealmAlias.objects.filter(domain='acme.com').exists()) + self.assertFalse(RealmDomain.objects.filter(domain='acme.com').exists()) self.assertTrue(realm.restricted_to_domain) def test_delete_all_aliases(self): # type: () -> None self.login("iago@zulip.com") realm = get_realm('zulip') - query = RealmAlias.objects.filter(realm=realm) + query = RealmDomain.objects.filter(realm=realm) self.assertTrue(realm.restricted_to_domain) for alias in query.all(): @@ -124,9 +124,9 @@ class RealmAliasTest(ZulipTestCase): realm2, created = do_create_realm('testrealm2', 'Test Realm 2') realm3, created = do_create_realm('testrealm3', 'Test Realm 3') - alias1 = RealmAlias.objects.create(realm=realm1, domain='test1.com', allow_subdomains=True) - alias2 = RealmAlias.objects.create(realm=realm2, domain='test2.test1.com', allow_subdomains=False) - RealmAlias.objects.create(realm=realm3, domain='test3.test2.test1.com', allow_subdomains=True) + alias1 = RealmDomain.objects.create(realm=realm1, domain='test1.com', allow_subdomains=True) + alias2 = RealmDomain.objects.create(realm=realm2, domain='test2.test1.com', allow_subdomains=False) + RealmDomain.objects.create(realm=realm3, domain='test3.test2.test1.com', allow_subdomains=True) def assert_and_check(email, realm_string_id): # type: (Text, Optional[Text]) -> None @@ -163,8 +163,8 @@ class RealmAliasTest(ZulipTestCase): realm1, created = do_create_realm('testrealm1', 'Test Realm 1', restricted_to_domain=True) realm2, created = do_create_realm('testrealm2', 'Test Realm 2', restricted_to_domain=True) - alias = RealmAlias.objects.create(realm=realm1, domain='test1.com', allow_subdomains=False) - RealmAlias.objects.create(realm=realm2, domain='test2.test1.com', allow_subdomains=True) + alias = RealmDomain.objects.create(realm=realm1, domain='test1.com', allow_subdomains=False) + RealmDomain.objects.create(realm=realm2, domain='test2.test1.com', allow_subdomains=True) self.assertEqual(email_allowed_for_realm('user@test1.com', realm1), True) self.assertEqual(email_allowed_for_realm('user@test2.test1.com', realm1), False) @@ -181,7 +181,7 @@ class RealmAliasTest(ZulipTestCase): # type: () -> None realm = get_realm('zulip') with self.settings(REALMS_HAVE_SUBDOMAINS=True), self.assertRaises(IntegrityError): - RealmAlias.objects.create(realm=realm, domain='zulip.com', allow_subdomains=True) + RealmDomain.objects.create(realm=realm, domain='zulip.com', allow_subdomains=True) def test_validate_domain(self): # type: () -> None diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 49f32fbe5b..b6875f58a6 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -20,7 +20,7 @@ from zerver.views.registration import confirmation_key from zerver.models import ( get_realm, get_prereg_user_by_email, get_user_profile_by_email, get_unique_open_realm, completely_open, - PreregistrationUser, Realm, RealmAlias, Recipient, + PreregistrationUser, Realm, RealmDomain, Recipient, Referral, ScheduledJob, UserProfile, UserMessage, Stream, Subscription, ScheduledJob ) diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index 5b86e0918d..d1135f4e5d 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -20,7 +20,7 @@ from zerver.lib.test_classes import ( from zerver.lib.test_runner import slow from zerver.models import UserProfile, Recipient, \ - Realm, RealmAlias, UserActivity, \ + Realm, RealmDomain, UserActivity, \ get_user_profile_by_email, get_realm, get_client, get_stream, \ Message, get_context_for_message @@ -216,7 +216,7 @@ class AdminCreateUserTest(ZulipTestCase): self.assert_json_error(result, "Email 'romeo@not-zulip.com' not allowed for realm 'zulip'") - RealmAlias.objects.create(realm=get_realm('zulip'), domain='zulip.net') + RealmDomain.objects.create(realm=get_realm('zulip'), domain='zulip.net') # HAPPY PATH STARTS HERE valid_params = dict( diff --git a/zerver/views/home.py b/zerver/views/home.py index 95147bfedb..346eace21b 100644 --- a/zerver/views/home.py +++ b/zerver/views/home.py @@ -13,7 +13,7 @@ from zerver.decorator import zulip_login_required, process_client from zerver.forms import ToSForm from zerver.lib.realm_icon import realm_icon_url from zerver.models import Message, UserProfile, Stream, Subscription, Huddle, \ - Recipient, Realm, UserMessage, DefaultStream, RealmEmoji, RealmAlias, \ + Recipient, Realm, UserMessage, DefaultStream, RealmEmoji, RealmDomain, \ RealmFilter, PreregistrationUser, UserActivity, \ UserPresence, get_recipient, name_changes_disabled, email_to_username, \ list_of_domains_for_realm diff --git a/zerver/views/messages.py b/zerver/views/messages.py index bbefef27d2..a8cb31c308 100644 --- a/zerver/views/messages.py +++ b/zerver/views/messages.py @@ -41,7 +41,7 @@ from zerver.lib.utils import statsd from zerver.lib.validator import \ check_list, check_int, check_dict, check_string, check_bool from zerver.models import Message, UserProfile, Stream, Subscription, \ - Realm, RealmAlias, Recipient, UserMessage, bulk_get_recipients, get_recipient, \ + Realm, RealmDomain, Recipient, UserMessage, bulk_get_recipients, get_recipient, \ get_user_profile_by_email, get_stream, \ parse_usermessage_flags, \ email_to_domain, get_realm, get_active_streams, \ @@ -777,10 +777,10 @@ def same_realm_zephyr_user(user_profile, email): domain = email_to_domain(email) - # Assumes allow_subdomains=False for all RealmAlias's corresponding to + # Assumes allow_subdomains=False for all RealmDomain's corresponding to # these realms. return user_profile.realm.is_zephyr_mirror_realm and \ - RealmAlias.objects.filter(realm=user_profile.realm, domain=domain).exists() + RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists() def same_realm_irc_user(user_profile, email): # type: (UserProfile, Text) -> bool @@ -794,9 +794,9 @@ def same_realm_irc_user(user_profile, email): domain = email_to_domain(email).replace("irc.", "") - # Assumes allow_subdomains=False for all RealmAlias's corresponding to + # Assumes allow_subdomains=False for all RealmDomain's corresponding to # these realms. - return RealmAlias.objects.filter(realm=user_profile.realm, domain=domain).exists() + return RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists() def same_realm_jabber_user(user_profile, email): # type: (UserProfile, Text) -> bool @@ -809,9 +809,9 @@ def same_realm_jabber_user(user_profile, email): # Zulip users, this is where you would do any translation. domain = email_to_domain(email) - # Assumes allow_subdomains=False for all RealmAlias's corresponding to + # Assumes allow_subdomains=False for all RealmDomain's corresponding to # these realms. - return RealmAlias.objects.filter(realm=user_profile.realm, domain=domain).exists() + return RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists() # We do not @require_login for send_message_backend, since it is used # both from the API and the web service. Code calling diff --git a/zerver/views/realm_aliases.py b/zerver/views/realm_aliases.py index 976354ad2f..1dba94c189 100644 --- a/zerver/views/realm_aliases.py +++ b/zerver/views/realm_aliases.py @@ -10,7 +10,7 @@ from zerver.lib.actions import do_add_realm_alias, do_change_realm_alias, \ from zerver.lib.domains import validate_domain from zerver.lib.response import json_error, json_success from zerver.lib.validator import check_bool, check_string -from zerver.models import can_add_alias, RealmAlias, UserProfile +from zerver.models import can_add_alias, RealmDomain, UserProfile from typing import Text @@ -28,7 +28,7 @@ def create_alias(request, user_profile, domain=REQ(validator=check_string), allo validate_domain(domain) except ValidationError as e: return json_error(_('Invalid domain: {}').format(e.messages[0])) - if RealmAlias.objects.filter(realm=user_profile.realm, domain=domain).exists(): + if RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists(): return json_error(_("The domain %(domain)s is already a part of your organization.") % {'domain': domain}) if not can_add_alias(domain): return json_error(_("The domain %(domain)s belongs to another organization.") % {'domain': domain}) @@ -40,9 +40,9 @@ def create_alias(request, user_profile, domain=REQ(validator=check_string), allo def patch_alias(request, user_profile, domain, allow_subdomains=REQ(validator=check_bool)): # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse) try: - alias = RealmAlias.objects.get(realm=user_profile.realm, domain=domain) + alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) do_change_realm_alias(alias, allow_subdomains) - except RealmAlias.DoesNotExist: + except RealmDomain.DoesNotExist: return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_success() @@ -51,8 +51,8 @@ def patch_alias(request, user_profile, domain, allow_subdomains=REQ(validator=ch def delete_alias(request, user_profile, domain): # type: (HttpRequest, UserProfile, Text) -> (HttpResponse) try: - alias = RealmAlias.objects.get(realm=user_profile.realm, domain=domain) + alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) do_remove_realm_alias(alias) - except RealmAlias.DoesNotExist: + except RealmDomain.DoesNotExist: return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_success() diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py index 2c4f898fe8..9a5fc4755a 100644 --- a/zilencer/management/commands/populate_db.py +++ b/zilencer/management/commands/populate_db.py @@ -6,7 +6,7 @@ from django.core.management.base import BaseCommand, CommandParser from django.utils import timezone from zerver.models import Message, UserProfile, Stream, Recipient, UserPresence, \ - Subscription, get_huddle, Realm, UserMessage, RealmAlias, \ + Subscription, get_huddle, Realm, UserMessage, RealmDomain, \ clear_database, get_client, get_user_profile_by_id, \ email_to_username from zerver.lib.actions import STREAM_ASSIGNMENT_COLORS, do_send_messages, \ @@ -125,12 +125,12 @@ class Command(BaseCommand): zulip_realm = Realm.objects.create( string_id="zulip", name="Zulip Dev", restricted_to_domain=True, invite_required=False, org_type=Realm.CORPORATE) - RealmAlias.objects.create(realm=zulip_realm, domain="zulip.com") + RealmDomain.objects.create(realm=zulip_realm, domain="zulip.com") if options["test_suite"]: mit_realm = Realm.objects.create( string_id="zephyr", name="MIT", restricted_to_domain=True, invite_required=False, org_type=Realm.CORPORATE) - RealmAlias.objects.create(realm=mit_realm, domain="mit.edu") + RealmDomain.objects.create(realm=mit_realm, domain="mit.edu") # Create test Users (UserProfiles are automatically created, # as are subscriptions to the ability to receive personals).