vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into gitlab

Browse source
This commit is contained in:
Joseph Schorr 2015-05-03 12:13:09 -04:00
commit e3aededcbc
70 changed files with 1000 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/oauthlogin.py
View file

@ -126,7 +126,7 @@ def github_oauth_callback():
# Exchange the OAuth code.
code = request.args.get('code')
token = google_login.exchange_code_for_token(app.config, client, code)
token = github_login.exchange_code_for_token(app.config, client, code)
# Retrieve the user's information.
user_data = get_user(github_login, token)
@ -214,7 +214,7 @@ def google_oauth_attach():
@require_session_login
def github_oauth_attach():
code = request.args.get('code')
token = google_login.exchange_code_for_token(app.config, client, code)
token = github_login.exchange_code_for_token(app.config, client, code)
user_data = get_user(github_login, token)
if not user_data:
return render_ologin_error('GitHub')