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

auth: Set valid_attestation more unconditionally in social auth.

Browse Source
This commit is contained in:
Tim Abbott
2017-11-21 15:41:18 -08:00
committed by Greg Price
parent ade5b4ea69
commit 665fc594db
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/tests/test_auth_backends.py
View File

@@ -431,7 +431,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
kwargs = {'realm': get_realm('zulip'), kwargs = {'realm': get_realm('zulip'),
'response': response, 'response': response,
'return_data': {}} 'return_data': {'valid_attestation': True}}
result.assert_called_with(self.user_profile, 'fake-access-token', **kwargs) result.assert_called_with(self.user_profile, 'fake-access-token', **kwargs)
def test_github_backend_do_auth_for_default_auth_failed(self): def test_github_backend_do_auth_for_default_auth_failed(self):
@@ -461,7 +461,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
kwargs = {'realm': get_realm('zulip'), kwargs = {'realm': get_realm('zulip'),
'response': response, 'response': response,
'return_data': {}} 'return_data': {'valid_attestation': True}}
result.assert_called_with(self.user_profile, 'fake-access-token', **kwargs) result.assert_called_with(self.user_profile, 'fake-access-token', **kwargs)
def test_github_backend_do_auth_for_team_auth_failed(self): def test_github_backend_do_auth_for_team_auth_failed(self):
@@ -491,7 +491,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
kwargs = {'realm': get_realm('zulip'), kwargs = {'realm': get_realm('zulip'),
'response': response, 'response': response,
'return_data': {}} 'return_data': {'valid_attestation': True}}
result.assert_called_with(self.user_profile, 'fake-access-token', **kwargs) result.assert_called_with(self.user_profile, 'fake-access-token', **kwargs)
def test_github_backend_do_auth_for_org_auth_failed(self): def test_github_backend_do_auth_for_org_auth_failed(self):

2
zproject/backends.py
View File

@@ -206,8 +206,8 @@ class SocialAuthMixin(ZulipAuthMixin):
try: try:
user_profile = get_user_profile_by_email(email_address) user_profile = get_user_profile_by_email(email_address)
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
return_data["valid_attestation"] = True
return None return None
return_data["valid_attestation"] = True
if not user_profile.is_active: if not user_profile.is_active:
return_data["inactive_user"] = True return_data["inactive_user"] = True