paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the SSO-only realm integration.

Browse Source 
It's messy code, only one customer ever used it, and it's not in use
today.

(imported from commit af3f512ac6af74af66c588c7d40d699e98514d0a)
This commit is contained in:
Tim Abbott
2015-09-19 21:16:18 -07:00
parent 25a9ccccf1
commit fcec80461b
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/feature_flags.js
View File

@@ -19,7 +19,6 @@ exports.disable_message_editing = _.contains(['mit.edu'], page_params.domain);
exports.is_og_zulip_user = _.contains(og_zuliper_emails, page_params.email); exports.is_og_zulip_user = _.contains(og_zuliper_emails, page_params.email);
exports.left_side_userlist = _.contains(['customer7.invalid'], page_params.domain); exports.left_side_userlist = _.contains(['customer7.invalid'], page_params.domain);
exports.enable_new_user_app_alerts = ! _.contains(['employees.customer16.invalid'], page_params.domain);
// Experimental modification to support much wider message views. // Experimental modification to support much wider message views.
exports.full_width = false; exports.full_width = false;

12
static/js/tutorial.js
View File

@@ -350,14 +350,12 @@ function finale() {
var alert_contents; var alert_contents;
if (page_params.enable_new_user_app_alerts) { if (page_params.prompt_for_invites) {
if (page_params.prompt_for_invites) { alert_contents = "<i class='icon-vector-heart alert-icon'></i>It's lonely in here! <a href='#invite-user' data-toggle='modal'>Invite some coworkers</a>.";
alert_contents = "<i class='icon-vector-heart alert-icon'></i>It's lonely in here! <a href='#invite-user' data-toggle='modal'>Invite some coworkers</a>."; } else {
} else { alert_contents = "<i class='icon-vector-desktop alert-icon'></i>What's better than " + page_params.product_name + " in your browser? The <a href='/apps' target='_blank'>"+ page_params.product_name + " desktop app</a>!";
alert_contents = "<i class='icon-vector-desktop alert-icon'></i>What's better than " + page_params.product_name + " in your browser? The <a href='/apps' target='_blank'>"+ page_params.product_name + " desktop app</a>!";
}
show_app_alert(alert_contents);
} }
show_app_alert(alert_contents);
// We start you in a narrow so it's not overwhelming. // We start you in a narrow so it's not overwhelming.
if (stream_data.in_home_view(page_params.notifications_stream)) { if (stream_data.in_home_view(page_params.notifications_stream)) {

6
zerver/views/__init__.py
View File

@@ -269,12 +269,6 @@ def accounts_register(request):
form = RegistrationForm( form = RegistrationForm(
initial={'full_name': hesiod_name if "@" not in hesiod_name else ""}) initial={'full_name': hesiod_name if "@" not in hesiod_name else ""})
name_validated = True name_validated = True
elif domain == 'employees.customer16.invalid':
full_name = email.rpartition('@')[0]
form = RegistrationForm(
initial={'full_name': full_name})
name_validated = True
request.session['authenticated_full_name'] = full_name
elif settings.POPULATE_PROFILE_VIA_LDAP: elif settings.POPULATE_PROFILE_VIA_LDAP:
for backend in get_backends(): for backend in get_backends():
if isinstance(backend, LDAPBackend): if isinstance(backend, LDAPBackend):

4
zproject/backends.py
View File

@@ -14,9 +14,7 @@ from oauth2client.crypt import AppIdentityError
def password_auth_enabled(realm): def password_auth_enabled(realm):
if realm is not None: if realm is not None:
if realm.domain == 'employees.customer16.invalid': if realm.domain == 'zulip.com' and settings.PRODUCTION:
return False
elif realm.domain == 'zulip.com' and settings.PRODUCTION:
# the dropbox realm is SSO only, but the unit tests still need to be # the dropbox realm is SSO only, but the unit tests still need to be
# able to login # able to login
return False return False