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

auth: Add GitHub to list of reported backends.

Browse Source
This commit is contained in:
Tim Abbott
2017-04-27 14:34:44 -07:00
parent 45b2b25026
commit 54b899860d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/tests/test_auth_backends.py
View File

@@ -1178,7 +1178,7 @@ class FetchAuthBackends(ZulipTestCase):
self.assert_json_success(result) self.assert_json_success(result)
data = ujson.loads(result.content) data = ujson.loads(result.content)
self.assertEqual(set(data.keys()), self.assertEqual(set(data.keys()),
{'msg', 'password', 'google', 'dev', 'result', 'zulip_version'}) {'msg', 'password', 'github', 'google', 'dev', 'result', 'zulip_version'})
for backend in set(data.keys()) - {'msg', 'result', 'zulip_version'}: for backend in set(data.keys()) - {'msg', 'result', 'zulip_version'}:
self.assertTrue(isinstance(data[backend], bool)) self.assertTrue(isinstance(data[backend], bool))
@@ -1192,6 +1192,7 @@ class FetchAuthBackends(ZulipTestCase):
self.assertEqual(data, { self.assertEqual(data, {
'msg': '', 'msg': '',
'password': False, 'password': False,
'github': False,
'google': True, 'google': True,
'dev': True, 'dev': True,
'result': 'success', 'result': 'success',
@@ -1207,6 +1208,7 @@ class FetchAuthBackends(ZulipTestCase):
self.assertEqual(data, { self.assertEqual(data, {
'msg': '', 'msg': '',
'password': False, 'password': False,
'github': False,
'google': True, 'google': True,
'dev': True, 'dev': True,
'result': 'success', 'result': 'success',
@@ -1229,6 +1231,7 @@ class FetchAuthBackends(ZulipTestCase):
self.assertEqual(data, { self.assertEqual(data, {
'msg': '', 'msg': '',
'password': False, 'password': False,
'github': False,
'google': False, 'google': False,
'dev': True, 'dev': True,
'result': 'success', 'result': 'success',
@@ -1249,6 +1252,7 @@ class FetchAuthBackends(ZulipTestCase):
self.assertEqual(data, { self.assertEqual(data, {
'msg': '', 'msg': '',
'password': False, 'password': False,
'github': False,
'google': False, 'google': False,
'dev': True, 'dev': True,
'result': 'success', 'result': 'success',

5
zerver/views/auth.py
View File

@@ -29,8 +29,8 @@ from zerver.lib.validator import validate_login_email
from zerver.models import PreregistrationUser, UserProfile, remote_user_to_email, Realm from zerver.models import PreregistrationUser, UserProfile, remote_user_to_email, Realm
from zerver.views.registration import create_preregistration_user, get_realm_from_request, \ from zerver.views.registration import create_preregistration_user, get_realm_from_request, \
redirect_and_log_into_subdomain redirect_and_log_into_subdomain
from zproject.backends import password_auth_enabled, dev_auth_enabled, google_auth_enabled, \ from zproject.backends import password_auth_enabled, dev_auth_enabled, \
ldap_auth_enabled github_auth_enabled, google_auth_enabled, ldap_auth_enabled
from version import ZULIP_VERSION from version import ZULIP_VERSION
import hashlib import hashlib
@@ -510,6 +510,7 @@ def api_get_auth_backends(request):
realm = None realm = None
return json_success({"password": password_auth_enabled(realm), return json_success({"password": password_auth_enabled(realm),
"dev": dev_auth_enabled(realm), "dev": dev_auth_enabled(realm),
"github": github_auth_enabled(realm),
"google": google_auth_enabled(realm), "google": google_auth_enabled(realm),
"zulip_version": ZULIP_VERSION, "zulip_version": ZULIP_VERSION,
}) })