Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

log_into_subdomain: User should be None in signup.

This commit is contained in:
Umair Khan 2017-05-10 12:00:47 +05:00 committed by Tim Abbott
parent 5019b53492
commit 11426a2cec
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/views/auth.py
View File

@ -392,7 +392,13 @@ def log_into_subdomain(request):
email_address = data['email']
full_name = data['name']
is_signup = data['is_signup']
user_profile, return_data = authenticate_remote_user(request, email_address)
if is_signup:
# If we are signing up, user_profile should be None. In case
# email_address already exists, user will get an error message.
user_profile = None
return_data = {} # type: Dict[str, Any]
else:
user_profile, return_data = authenticate_remote_user(request, email_address)
invalid_subdomain = bool(return_data.get('invalid_subdomain'))
return login_or_register_remote_user(request, email_address, user_profile,
full_name, invalid_subdomain=invalid_subdomain,