diff --git a/zerver/forms.py b/zerver/forms.py index a2f0bdae1a..9e63fc896c 100644 --- a/zerver/forms.py +++ b/zerver/forms.py @@ -23,10 +23,6 @@ SIGNUP_STRING = 'Sign up to find out when def has_valid_realm(value): return Realm.objects.filter(domain=value.split("@")[-1]).exists() -def isnt_mit(value): - if "@mit.edu" in value: - raise ValidationError(mark_safe(u'Zulip for MIT is by invitation only. ' + SIGNUP_STRING)) - def not_mit_mailing_list(value): # I don't want ec-discuss signed up for Zulip if "@mit.edu" in value: diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 4569d98a92..25fe9baf4f 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -1757,12 +1757,6 @@ def do_invite_users(user_profile, invitee_emails, streams): errors.append((email, "Outside your domain.")) continue - # Redundant check in case earlier validation preventing MIT users from - # inviting people fails. - if "@mit.edu" in email: - errors.append((email, "Invitations are not enabled for MIT at this time.")) - continue - try: user_email_is_unique(email) except ValidationError: diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 202a0ecaa1..1af1078511 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -40,7 +40,7 @@ from zerver.lib.actions import do_remove_subscription, bulk_remove_subscriptions update_user_activity_interval, do_set_muted_topics, do_rename_stream from zerver.lib.create_user import random_api_key from zerver.forms import RegistrationForm, HomepageForm, ToSForm, CreateBotForm, \ - is_inactive, isnt_mit, not_mit_mailing_list + is_inactive, not_mit_mailing_list from django.views.decorators.csrf import csrf_exempt, csrf_protect from django_openid_auth.views import default_render_failure, login_complete from openid.consumer.consumer import SUCCESS as openid_SUCCESS @@ -460,12 +460,6 @@ def api_endpoint_docs(request): @authenticated_json_post_view @has_request_variables def json_invite_users(request, user_profile, invitee_emails=REQ): - # Validation - try: - isnt_mit(user_profile.email) - except ValidationError, e: - return json_error(e.message) - if not invitee_emails: return json_error("You must specify at least one email address.") @@ -717,12 +711,7 @@ def home(request): )) statsd.incr('views.home') - - try: - isnt_mit(user_profile.email) - show_invites = True - except ValidationError: - show_invites = False + show_invites = True # For the CUSTOMER4 student realm, only let instructors (who have # @customer4.invalid addresses) invite new users.