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

Rename GitHubBackend to GitHubAuthBackend for consistency.

Browse Source
This commit is contained in:
Tim Abbott
2016-07-29 12:47:14 -07:00
parent d43b031a32
commit 6b2b7ab3ff
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/tests/test_auth_backends.py
View File

@@ -18,7 +18,7 @@ from zerver.models import \
from zproject.backends import ZulipDummyBackend, EmailAuthBackend, \
GoogleMobileOauth2Backend, ZulipRemoteUserBackend, ZulipLDAPAuthBackend, \
ZulipLDAPUserPopulator, DevAuthBackend, GitHubBackend
ZulipLDAPUserPopulator, DevAuthBackend, GitHubAuthBackend
from social.strategies.django_strategy import DjangoStrategy
from social.storage.django_orm import BaseDjangoStorage
@@ -160,15 +160,15 @@ class AuthBackendTest(TestCase):
email = 'hamlet@zulip.com'
good_kwargs = dict(response=dict(email=email), return_data=dict())
bad_kwargs = dict() # type: Dict[str, str]
self.verify_backend(GitHubBackend(),
self.verify_backend(GitHubAuthBackend(),
good_kwargs=good_kwargs,
bad_kwargs=bad_kwargs)
class GitHubBackendTest(AuthedTestCase):
class GitHubAuthBackendTest(AuthedTestCase):
def setUp(self):
self.email = 'hamlet@zulip.com'
self.name = 'Hamlet'
self.backend = GitHubBackend()
self.backend = GitHubAuthBackend()
self.backend.strategy = DjangoStrategy(storage=BaseDjangoStorage())
self.user_profile = get_user_profile_by_email(self.email)
self.user_profile.backend = self.backend

6
zproject/backends.py
View File

@@ -59,7 +59,7 @@ def common_get_active_user_by_email(email, return_data=None):
def github_auth_enabled():
for backend in django.contrib.auth.get_backends():
if isinstance(backend, GitHubBackend):
if isinstance(backend, GitHubAuthBackend):
return True
return False
@@ -267,7 +267,7 @@ class DevAuthBackend(ZulipAuthMixin):
def authenticate(self, username, return_data=None):
return common_get_active_user_by_email(username, return_data=return_data)
class GitHubBackend(SocialAuthMixin, GithubOAuth2):
class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
def get_email_address(self, *args, **kwargs):
try:
return kwargs['response']['email']
@@ -282,5 +282,5 @@ class GitHubBackend(SocialAuthMixin, GithubOAuth2):
def do_auth(self, *args, **kwargs):
kwargs['return_data'] = {}
user_profile = super(GitHubBackend, self).do_auth(*args, **kwargs)
user_profile = super(GitHubAuthBackend, self).do_auth(*args, **kwargs)
return self.process_do_auth(user_profile, *args, **kwargs)