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

auth: Convert EmailAuthBackend to use new helper.

Browse Source 
This lets us delete some duplicate code, since common_get_active_user
handles an account in the wrong subdomain for us.

Also lets us delete the now-unused common_get_active_user_by_email.
This commit is contained in:
Tim Abbott
2017-11-21 12:42:21 -08:00
parent 8c21619be8
commit 195a78ad11
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zproject/backends.py
View File

@@ -111,22 +111,6 @@ def common_get_active_user(email: str, realm: Realm,
return None return None
return user_profile return user_profile
def common_get_active_user_by_email(email, return_data=None):
# type: (Text, Optional[Dict[str, Any]]) -> Optional[UserProfile]
try:
user_profile = get_user_profile_by_email(email)
except UserProfile.DoesNotExist:
return None
if not user_profile.is_active:
if return_data is not None:
return_data['inactive_user'] = True
return None
if user_profile.realm.deactivated:
if return_data is not None:
return_data['inactive_realm'] = True
return None
return user_profile
class ZulipAuthMixin: class ZulipAuthMixin:
def get_user(self, user_profile_id): def get_user(self, user_profile_id):
# type: (int) -> Optional[UserProfile] # type: (int) -> Optional[UserProfile]
@@ -354,14 +338,10 @@ class EmailAuthBackend(ZulipAuthMixin):
return_data['email_auth_disabled'] = True return_data['email_auth_disabled'] = True
return None return None
user_profile = common_get_active_user_by_email(username, return_data=return_data) user_profile = common_get_active_user(username, realm, return_data=return_data)
if user_profile is None: if user_profile is None:
return None return None
if user_profile.check_password(password): if user_profile.check_password(password):
if not user_matches_subdomain(realm.subdomain, user_profile):
if return_data is not None:
return_data["invalid_subdomain"] = True
return None
return user_profile return user_profile
return None return None