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

Revert "github: Call the appropriate authenticate."

Browse Source 
This reverts commit ab260731a9.

The overridden authenticate method was buggy.
This commit is contained in:
Tim Abbott
2017-04-19 10:05:04 -07:00
parent 326cf9a73e
commit 55bea73035
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/tests/test_auth_backends.py
View File

@@ -39,12 +39,13 @@ from zproject.backends import ZulipDummyBackend, EmailAuthBackend, \
GoogleMobileOauth2Backend, ZulipRemoteUserBackend, ZulipLDAPAuthBackend, \
ZulipLDAPUserPopulator, DevAuthBackend, GitHubAuthBackend, ZulipAuthMixin, \
dev_auth_enabled, password_auth_enabled, github_auth_enabled, \
SocialAuthMixin, AUTH_BACKEND_NAME_MAP, SocialAuthStrategy
SocialAuthMixin, AUTH_BACKEND_NAME_MAP
from zerver.views.auth import maybe_send_to_registration
from version import ZULIP_VERSION
from social_core.exceptions import AuthFailed, AuthStateForbidden
from social_django.strategy import DjangoStrategy
from social_django.storage import BaseDjangoStorage
from social_core.backends.github import GithubOrganizationOAuth2, GithubTeamOAuth2, \
GithubOAuth2
@@ -391,7 +392,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
self.email = 'hamlet@zulip.com'
self.name = 'Hamlet'
self.backend = GitHubAuthBackend()
self.backend.strategy = SocialAuthStrategy(storage=BaseDjangoStorage())
self.backend.strategy = DjangoStrategy(storage=BaseDjangoStorage())
self.user_profile = get_user_profile_by_email(self.email)
self.user_profile.backend = self.backend
@@ -405,7 +406,7 @@ class GitHubAuthBackendTest(ZulipTestCase):
def do_auth(self, *args, **kwargs):
# type: (*Any, **Any) -> UserProfile
with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.GitHubAuthBackend',)):
return self.backend.strategy.authenticate(self.backend, **kwargs)
return self.backend.authenticate(**kwargs)
def test_github_auth_enabled(self):
# type: () -> None

8
zproject/backends.py
View File

@@ -17,7 +17,6 @@ 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_core.backends.base import BaseAuth
from social_core.backends.github import GithubOAuth2, GithubOrganizationOAuth2, \
GithubTeamOAuth2
from social_core.exceptions import AuthFailed, SocialAuthBaseException
@@ -103,11 +102,6 @@ class ZulipAuthMixin(object):
except UserProfile.DoesNotExist:
return None
class SocialAuthStrategy(DjangoStrategy):
def authenticate(self, backend, *args, **kwargs):
# type: (BaseAuth, *Any, **Any) -> None
return backend.authenticate(*args, **kwargs)
class SocialAuthMixin(ZulipAuthMixin):
auth_backend_name = None # type: Text
@@ -122,7 +116,7 @@ class SocialAuthMixin(ZulipAuthMixin):
def authenticate(self,
realm_subdomain='', # type: Optional[Text]
storage=None, # type: Optional[DjangoStorage]
strategy=None, # type: Optional[SocialAuthStrategy]
strategy=None, # type: Optional[DjangoStrategy]
user=None, # type: Optional[Dict[str, Any]]
return_data=None, # type: Optional[Dict[str, Any]]
response=None, # type: Optional[Dict[str, Any]]

1
zproject/settings.py
View File

@@ -1209,7 +1209,6 @@ SOCIAL_AUTH_GITHUB_ORG_KEY = SOCIAL_AUTH_GITHUB_KEY
SOCIAL_AUTH_GITHUB_ORG_SECRET = SOCIAL_AUTH_GITHUB_SECRET
SOCIAL_AUTH_GITHUB_TEAM_KEY = SOCIAL_AUTH_GITHUB_KEY
SOCIAL_AUTH_GITHUB_TEAM_SECRET = SOCIAL_AUTH_GITHUB_SECRET
SOCIAL_AUTH_STRATEGY = 'zproject.backends.SocialAuthStrategy'
########################################################################
# EMAIL SETTINGS