Skip to content
This repository was archived by the owner on May 13, 2019. It is now read-only.

If CALLBACK_DOMAIN is empty, set the redirect URI to the current domain #3

Open
jordanambra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

If CALLBACK_DOMAIN is empty, set the redirect URI to the current domain #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions googleauth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,15 @@ def generate_csrf_token():
return ''.join(random.choice(CSRF_CHARACTERS) for x in range(32))


def generate_redirect_uri():
def generate_redirect_uri(request):
scheme = 'https' if USE_HTTPS else 'http'
path = reverse('googleauth_callback')
return '%s://%s%s' % (scheme, CALLBACK_DOMAIN, path)

domain = CALLBACK_DOMAIN
if domain == "":
domain = request.META.get("HTTP_HOST", domain)

return '%s://%s%s' % (scheme, domain, path)


#
Expand All @@ -51,7 +56,7 @@ def login(request):
'client_id': CLIENT_ID,
'response_type': 'code',
'scope': 'openid email profile',
'redirect_uri': generate_redirect_uri(),
'redirect_uri': generate_redirect_uri(request),
'state': csrf_token,
}

Expand All @@ -73,7 +78,7 @@ def callback(request):
'code': request.GET.get('code'),
'client_id': CLIENT_ID,
'client_secret': CLIENT_SECRET,
'redirect_uri': generate_redirect_uri(),
'redirect_uri': generate_redirect_uri(request),
'grant_type': 'authorization_code',
}

Expand Down