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

auth: Factor out some uses of EXTERNAL_HOST with ROOT_DOMAIN_URI.

Browse Source 
Apart from being less verbose, this makes it more manifest (on e.g. grep)
that we aren't using EXTERNAL_HOST here to construct subdomains.
This commit is contained in:
Greg Price
2017-10-26 18:17:12 -07:00
committed by Tim Abbott
parent 318682fd52
commit ad551427ed
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/views/auth.py
View File

@@ -240,6 +240,10 @@ def google_oauth2_csrf(request, value):
token = _unsalt_cipher_token(get_token(request)) token = _unsalt_cipher_token(get_token(request))
return hmac.new(token.encode('utf-8'), value.encode("utf-8"), hashlib.sha256).hexdigest() return hmac.new(token.encode('utf-8'), value.encode("utf-8"), hashlib.sha256).hexdigest()
def reverse_on_root(viewname, args=None, kwargs=None):
# type: (str, List[str], Dict[str, str]) -> str
return settings.ROOT_DOMAIN_URI + reverse(viewname, args=args, kwargs=kwargs)
def start_google_oauth2(request): def start_google_oauth2(request):
# type: (HttpRequest) -> HttpResponse # type: (HttpRequest) -> HttpResponse
url = reverse('zerver.views.auth.send_oauth_request_to_google') url = reverse('zerver.views.auth.send_oauth_request_to_google')
@@ -252,11 +256,7 @@ def start_google_oauth2(request):
def redirect_to_main_site(request, url, is_signup=False): def redirect_to_main_site(request, url, is_signup=False):
# type: (HttpRequest, Text, bool) -> HttpResponse # type: (HttpRequest, Text, bool) -> HttpResponse
main_site_uri = ''.join(( main_site_uri = settings.ROOT_DOMAIN_URI + url
settings.EXTERNAL_URI_SCHEME,
settings.EXTERNAL_HOST,
url,
))
params = { params = {
'subdomain': get_subdomain(request), 'subdomain': get_subdomain(request),
'is_signup': '1' if is_signup else '0', 'is_signup': '1' if is_signup else '0',
@@ -305,11 +305,7 @@ def send_oauth_request_to_google(request):
params = { params = {
'response_type': 'code', 'response_type': 'code',
'client_id': settings.GOOGLE_OAUTH2_CLIENT_ID, 'client_id': settings.GOOGLE_OAUTH2_CLIENT_ID,
'redirect_uri': ''.join(( 'redirect_uri': reverse_on_root('zerver.views.auth.finish_google_oauth2'),
settings.EXTERNAL_URI_SCHEME,
settings.EXTERNAL_HOST,
reverse('zerver.views.auth.finish_google_oauth2'),
)),
'scope': 'profile email', 'scope': 'profile email',
'state': csrf_state, 'state': csrf_state,
} }
@@ -345,11 +341,7 @@ def finish_google_oauth2(request):
'code': request.GET.get('code'), 'code': request.GET.get('code'),
'client_id': settings.GOOGLE_OAUTH2_CLIENT_ID, 'client_id': settings.GOOGLE_OAUTH2_CLIENT_ID,
'client_secret': settings.GOOGLE_OAUTH2_CLIENT_SECRET, 'client_secret': settings.GOOGLE_OAUTH2_CLIENT_SECRET,
'redirect_uri': ''.join(( 'redirect_uri': reverse_on_root('zerver.views.auth.finish_google_oauth2'),
settings.EXTERNAL_URI_SCHEME,
settings.EXTERNAL_HOST,
reverse('zerver.views.auth.finish_google_oauth2'),
)),
'grant_type': 'authorization_code', 'grant_type': 'authorization_code',
}, },
) )