paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 16:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

requirements: Upgrade python-social-auth to latest version

Browse Source 
Fixes #3403
This commit is contained in:
sinwar
2017-01-21 21:22:59 +05:30
parent 15c4ae9ea9
commit b0efa58eb4
6 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
requirements/py2_socialauth.txt
View File

@@ -1,3 +1,4 @@
python_social_auth==0.2.21
social-auth-core==0.2.1
social-auth-app-django==0.1.0
python-openid==2.2.5
PyJWT==1.4.2

3
requirements/py3_socialauth.txt
View File

@@ -1,3 +1,4 @@
python_social_auth==0.2.21
social-auth-core==0.2.1
social-auth-app-django==0.1.0
python3-openid==3.0.10
PyJWT==1.4.2

28
zerver/tests/test_auth_backends.py
View File

@@ -36,10 +36,10 @@ from zproject.backends import ZulipDummyBackend, EmailAuthBackend, \
from zerver.views.auth import maybe_send_to_registration
from social.exceptions import AuthFailed
from social.strategies.django_strategy import DjangoStrategy
from social.storage.django_orm import BaseDjangoStorage
from social.backends.github import GithubOrganizationOAuth2, GithubTeamOAuth2, \
from social_core.exceptions import AuthFailed
from social_django.strategy import DjangoStrategy
from social_django.storage import BaseDjangoStorage
from social_core.backends.github import GithubOrganizationOAuth2, GithubTeamOAuth2, \
GithubOAuth2
from six.moves import urllib
@@ -359,7 +359,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_without_subdomains(self):
# type: () -> None
with mock.patch('social.backends.github.GithubOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOAuth2.do_auth',
side_effect=self.do_auth), \
mock.patch('zerver.views.auth.login'):
response = dict(email=self.email, name=self.name)
@@ -368,7 +368,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_with_non_existing_subdomain(self):
# type: () -> None
with mock.patch('social.backends.github.GithubOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOAuth2.do_auth',
side_effect=self.do_auth):
with self.settings(REALMS_HAVE_SUBDOMAINS=True):
self.backend.strategy.session_set('subdomain', 'test')
@@ -378,7 +378,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_with_subdomains(self):
# type: () -> None
with mock.patch('social.backends.github.GithubOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOAuth2.do_auth',
side_effect=self.do_auth):
with self.settings(REALMS_HAVE_SUBDOMAINS=True):
self.backend.strategy.session_set('subdomain', 'zulip')
@@ -388,7 +388,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_for_default(self):
# type: () -> None
with mock.patch('social.backends.github.GithubOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOAuth2.do_auth',
side_effect=self.do_auth), \
mock.patch('zproject.backends.SocialAuthMixin.process_do_auth') as result:
response = dict(email=self.email, name=self.name)
@@ -401,7 +401,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_for_team(self):
# type: () -> None
with mock.patch('social.backends.github.GithubTeamOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubTeamOAuth2.do_auth',
side_effect=self.do_auth), \
mock.patch('zproject.backends.SocialAuthMixin.process_do_auth') as result:
response = dict(email=self.email, name=self.name)
@@ -415,7 +415,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_for_team_auth_failed(self):
# type: () -> None
with mock.patch('social.backends.github.GithubTeamOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubTeamOAuth2.do_auth',
side_effect=AuthFailed('Not found')), \
mock.patch('logging.info'), \
mock.patch('zproject.backends.SocialAuthMixin.process_do_auth') as result:
@@ -429,7 +429,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_for_org(self):
# type: () -> None
with mock.patch('social.backends.github.GithubOrganizationOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOrganizationOAuth2.do_auth',
side_effect=self.do_auth), \
mock.patch('zproject.backends.SocialAuthMixin.process_do_auth') as result:
response = dict(email=self.email, name=self.name)
@@ -443,7 +443,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def test_github_backend_do_auth_for_org_auth_failed(self):
# type: () -> None
with mock.patch('social.backends.github.GithubOrganizationOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOrganizationOAuth2.do_auth',
side_effect=AuthFailed('Not found')), \
mock.patch('logging.info'), \
mock.patch('zproject.backends.SocialAuthMixin.process_do_auth') as result:
@@ -474,7 +474,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
return self.user_profile
with mock.patch('zerver.views.auth.login_or_register_remote_user') as result, \
mock.patch('social.backends.github.GithubOAuth2.do_auth',
mock.patch('social_core.backends.github.GithubOAuth2.do_auth',
side_effect=do_auth_inactive):
response = dict(email=self.email, name=self.name)
user = self.backend.do_auth(response=response)
@@ -495,7 +495,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
return_data['valid_attestation'] = True
return None
with mock.patch('social.backends.github.GithubOAuth2.do_auth',
with mock.patch('social_core.backends.github.GithubOAuth2.do_auth',
side_effect=do_auth):
response = dict(email='nonexisting@phantom.com', name='Ghost')
result = self.backend.do_auth(response=response)

4
zproject/backends.py
View File

@@ -17,9 +17,9 @@ from zerver.models import UserProfile, Realm, get_user_profile_by_id, \
from apiclient.sample_tools import client as googleapiclient
from oauth2client.crypt import AppIdentityError
from social.backends.github import GithubOAuth2, GithubOrganizationOAuth2, \
from social_core.backends.github import GithubOAuth2, GithubOrganizationOAuth2, \
GithubTeamOAuth2
from social.exceptions import AuthFailed
from social_core.exceptions import AuthFailed
from django.contrib.auth import authenticate
from zerver.lib.utils import check_subdomain, get_subdomain

2
zproject/settings.py
View File

@@ -350,7 +350,7 @@ INSTALLED_APPS = [
'guardian',
'pipeline',
'zerver',
'social.apps.django_app.default',
'social_django',
]
if USING_PGROONGA:
INSTALLED_APPS += ['pgroonga']

2
zproject/urls.py
View File

@@ -384,7 +384,7 @@ urls += [
]
# Python Social Auth
urls += [url(r'^', include('social.apps.django_app.urls', namespace='social'))]
urls += [url(r'^', include('social_django.urls', namespace='social'))]
# User documentation site
urls += [url(r'^help/(?P<article>.*)$', HelpView.as_view(template_name='zerver/help/main.html'))]