From 13bb546ddd22bafbb02a17e1aec00f8f0a5a9c4c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 1 Oct 2017 23:04:12 -0700 Subject: [PATCH] subdomains: Hardcode can_add_realm_domains=True. It was already always True if REALMS_HAVE_SUBDOMAINS, and now that's the only supported configuration. --- zerver/management/commands/realm_domain.py | 5 +---- zerver/models.py | 8 -------- zerver/tests/test_realm_domains.py | 10 ++++------ zerver/views/realm_domains.py | 5 +---- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/zerver/management/commands/realm_domain.py b/zerver/management/commands/realm_domain.py index b918173b82..cc7836387a 100644 --- a/zerver/management/commands/realm_domain.py +++ b/zerver/management/commands/realm_domain.py @@ -4,7 +4,7 @@ from typing import Any from argparse import ArgumentParser from django.core.exceptions import ValidationError from django.db.utils import IntegrityError -from zerver.models import can_add_realm_domain, RealmDomain, get_realm_domains +from zerver.models import RealmDomain, get_realm_domains from zerver.lib.management import ZulipBaseCommand from zerver.lib.domains import validate_domain import sys @@ -49,9 +49,6 @@ class Command(ZulipBaseCommand): sys.exit(1) if options["op"] == "add": try: - if not can_add_realm_domain(domain): - print("The domain %(domain)s belongs to another organization." % {'domain': domain}) - sys.exit(1) RealmDomain.objects.create(realm=realm, domain=domain, allow_subdomains=options["allow_subdomains"]) sys.exit(0) diff --git a/zerver/models.py b/zerver/models.py index b194b142f7..e950128c01 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -319,14 +319,6 @@ class RealmDomain(models.Model): class Meta(object): unique_together = ("realm", "domain") -def can_add_realm_domain(domain): - # type: (Text) -> bool - if settings.REALMS_HAVE_SUBDOMAINS: - return True - if RealmDomain.objects.filter(domain=domain).exists(): - return False - return True - # These functions should only be used on email addresses that have # been validated via django.core.validators.validate_email # diff --git a/zerver/tests/test_realm_domains.py b/zerver/tests/test_realm_domains.py index e96581763e..7b6c25d6ab 100644 --- a/zerver/tests/test_realm_domains.py +++ b/zerver/tests/test_realm_domains.py @@ -62,12 +62,10 @@ class RealmDomainTest(ZulipTestCase): self.login(mit_user_profile.email) do_change_is_admin(mit_user_profile, True) - result = self.client_post("/json/realm/domains", info=data) - self.assert_json_error(result, 'The domain acme.com belongs to another organization.') - with self.settings(REALMS_HAVE_SUBDOMAINS=True): - result = self.client_post("/json/realm/domains", info=data, - HTTP_HOST=mit_user_profile.realm.host) - self.assert_json_success(result) + + result = self.client_post("/json/realm/domains", info=data, + HTTP_HOST=mit_user_profile.realm.host) + self.assert_json_success(result) def test_patch_realm_domain(self): # type: () -> None diff --git a/zerver/views/realm_domains.py b/zerver/views/realm_domains.py index 5bc7c87891..12fa676f5c 100644 --- a/zerver/views/realm_domains.py +++ b/zerver/views/realm_domains.py @@ -9,8 +9,7 @@ from zerver.lib.actions import do_add_realm_domain, do_change_realm_domain, \ 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_realm_domain, RealmDomain, UserProfile, \ - get_realm_domains +from zerver.models import RealmDomain, UserProfile, get_realm_domains from typing import Text @@ -30,8 +29,6 @@ def create_realm_domain(request, user_profile, domain=REQ(validator=check_string return json_error(_('Invalid domain: {}').format(e.messages[0])) 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_realm_domain(domain): - return json_error(_("The domain %(domain)s belongs to another organization.") % {'domain': domain}) realm_domain = do_add_realm_domain(user_profile.realm, domain, allow_subdomains) return json_success({'new_domain': [realm_domain.id, realm_domain.domain]})