paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

default stream groups: Use cleaner system for error handling.

Browse Source 
Wherever possible, we always want to move checking for error
conditions to the views code, so that we don't need to worry about
handling failures with (in this case) a user that's half-created
because a DefaultStreamGroup doesn't exist.
This commit is contained in:
Tim Abbott
2017-10-26 11:31:43 -07:00
parent eecdc5bb61
commit b8658c6901
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
zerver/lib/actions.py
View File

@@ -310,8 +310,8 @@ def add_new_user_history(user_profile, streams):
# * Deactivates PreregistrationUser objects # * Deactivates PreregistrationUser objects
# * subscribe the user to newsletter if newsletter_data is specified # * subscribe the user to newsletter if newsletter_data is specified
def process_new_human_user(user_profile, prereg_user=None, newsletter_data=None, def process_new_human_user(user_profile, prereg_user=None, newsletter_data=None,
default_stream_group_names=[]): default_stream_groups=[]):
# type: (UserProfile, Optional[PreregistrationUser], Optional[Dict[str, str]], List[str]) -> None # type: (UserProfile, Optional[PreregistrationUser], Optional[Dict[str, str]], List[DefaultStreamGroup]) -> None
mit_beta_user = user_profile.realm.is_zephyr_mirror_realm mit_beta_user = user_profile.realm.is_zephyr_mirror_realm
if prereg_user is not None: if prereg_user is not None:
streams = prereg_user.streams.all() streams = prereg_user.streams.all()
@@ -324,12 +324,8 @@ def process_new_human_user(user_profile, prereg_user=None, newsletter_data=None,
# add the default streams # add the default streams
if len(streams) == 0: if len(streams) == 0:
streams = get_default_subs(user_profile) streams = get_default_subs(user_profile)
for default_stream_group_name in default_stream_group_names:
try:
default_stream_group = DefaultStreamGroup.objects.get(name=default_stream_group_name, realm=user_profile.realm)
except DefaultStreamGroup.DoesNotExist:
raise JsonableError(_('Invalid default stream group %s' % (default_stream_group_name,)))
for default_stream_group in default_stream_groups:
default_stream_group_streams = default_stream_group.streams.all() default_stream_group_streams = default_stream_group.streams.all()
for stream in default_stream_group_streams: for stream in default_stream_group_streams:
if stream not in streams: if stream not in streams:
@@ -436,8 +432,9 @@ def do_create_user(email, password, realm, full_name, short_name,
timezone=u"", avatar_source=UserProfile.AVATAR_FROM_GRAVATAR, timezone=u"", avatar_source=UserProfile.AVATAR_FROM_GRAVATAR,
default_sending_stream=None, default_events_register_stream=None, default_sending_stream=None, default_events_register_stream=None,
default_all_public_streams=None, prereg_user=None, default_all_public_streams=None, prereg_user=None,
newsletter_data=None, default_stream_group_names=[]): newsletter_data=None, default_stream_groups=[]):
# type: (Text, Optional[Text], Realm, Text, Text, bool, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, Text, Optional[Stream], Optional[Stream], bool, Optional[PreregistrationUser], Optional[Dict[str, str]], List[str]) -> UserProfile # type: (Text, Optional[Text], Realm, Text, Text, bool, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, Text, Optional[Stream], Optional[Stream], bool, Optional[PreregistrationUser], Optional[Dict[str, str]], List[DefaultStreamGroup]) -> UserProfile
user_profile = create_user(email=email, password=password, realm=realm, user_profile = create_user(email=email, password=password, realm=realm,
full_name=full_name, short_name=short_name, full_name=full_name, short_name=short_name,
active=active, is_realm_admin=is_realm_admin, active=active, is_realm_admin=is_realm_admin,
@@ -459,7 +456,7 @@ def do_create_user(email, password, realm, full_name, short_name,
else: else:
process_new_human_user(user_profile, prereg_user=prereg_user, process_new_human_user(user_profile, prereg_user=prereg_user,
newsletter_data=newsletter_data, newsletter_data=newsletter_data,
default_stream_group_names=default_stream_group_names) default_stream_groups=default_stream_groups)
return user_profile return user_profile
def do_activate_user(user_profile): def do_activate_user(user_profile):
@@ -2778,6 +2775,18 @@ def do_set_user_display_setting(user_profile, setting_name, setting_value):
send_event(dict(type='realm_user', op='update', person=payload), send_event(dict(type='realm_user', op='update', person=payload),
active_user_ids(user_profile.realm_id)) active_user_ids(user_profile.realm_id))
def lookup_default_stream_groups(default_stream_group_names, realm):
# type: (List[str], Realm) -> List[DefaultStreamGroup]
default_stream_groups = []
for group_name in default_stream_group_names:
try:
default_stream_group = DefaultStreamGroup.objects.get(
name=group_name, realm=realm)
except DefaultStreamGroup.DoesNotExist:
raise JsonableError(_('Invalid default stream group %s' % (group_name,)))
default_stream_groups.append(default_stream_group)
return default_stream_groups
def set_default_streams(realm, stream_dict): def set_default_streams(realm, stream_dict):
# type: (Realm, Dict[Text, Dict[Text, Any]]) -> None # type: (Realm, Dict[Text, Dict[Text, Any]]) -> None
DefaultStream.objects.filter(realm=realm).delete() DefaultStream.objects.filter(realm=realm).delete()

7
zerver/views/registration.py
View File

@@ -20,7 +20,7 @@ from zerver.lib.events import do_events_register
from zerver.lib.actions import do_change_password, do_change_full_name, do_change_is_admin, \ from zerver.lib.actions import do_change_password, do_change_full_name, do_change_is_admin, \
do_activate_user, do_create_user, do_create_realm, \ do_activate_user, do_create_user, do_create_realm, \
user_email_is_unique, compute_mit_user_fullname, validate_email_for_realm, \ user_email_is_unique, compute_mit_user_fullname, validate_email_for_realm, \
do_set_user_display_setting do_set_user_display_setting, lookup_default_stream_groups
from zerver.forms import RegistrationForm, HomepageForm, RealmCreationForm, \ from zerver.forms import RegistrationForm, HomepageForm, RealmCreationForm, \
CreateUserForm, FindMyTeamForm CreateUserForm, FindMyTeamForm
from django_auth_ldap.backend import LDAPBackend, _LDAPUser from django_auth_ldap.backend import LDAPBackend, _LDAPUser
@@ -180,7 +180,8 @@ def accounts_register(request):
full_name = form.cleaned_data['full_name'] full_name = form.cleaned_data['full_name']
short_name = email_to_username(email) short_name = email_to_username(email)
default_stream_groups = request.POST.getlist('default_stream_group') default_stream_group_names = request.POST.getlist('default_stream_group')
default_stream_groups = lookup_default_stream_groups(default_stream_group_names, realm)
timezone = u"" timezone = u""
if 'timezone' in request.POST and request.POST['timezone'] in get_all_timezones(): if 'timezone' in request.POST and request.POST['timezone'] in get_all_timezones():
@@ -232,7 +233,7 @@ def accounts_register(request):
tos_version=settings.TOS_VERSION, tos_version=settings.TOS_VERSION,
timezone=timezone, timezone=timezone,
newsletter_data={"IP": request.META['REMOTE_ADDR']}, newsletter_data={"IP": request.META['REMOTE_ADDR']},
default_stream_group_names=default_stream_groups) default_stream_groups=default_stream_groups)
if realm_creation: if realm_creation:
setup_initial_private_stream(user_profile) setup_initial_private_stream(user_profile)