Check to make sure we can load the github user data
This commit is contained in:
parent
4282977e90
commit
738c4a86ff
1 changed files with 5 additions and 0 deletions
|
@ -61,6 +61,8 @@ def github_oauth_callback():
|
||||||
|
|
||||||
token = exchange_github_code_for_token(request.args.get('code'))
|
token = exchange_github_code_for_token(request.args.get('code'))
|
||||||
user_data = get_github_user(token)
|
user_data = get_github_user(token)
|
||||||
|
if not user_data:
|
||||||
|
return render_page_template('githuberror.html', error_message='Could not load user data')
|
||||||
|
|
||||||
username = user_data['login']
|
username = user_data['login']
|
||||||
github_id = user_data['id']
|
github_id = user_data['id']
|
||||||
|
@ -112,6 +114,9 @@ def github_oauth_callback():
|
||||||
def github_oauth_attach():
|
def github_oauth_attach():
|
||||||
token = exchange_github_code_for_token(request.args.get('code'))
|
token = exchange_github_code_for_token(request.args.get('code'))
|
||||||
user_data = get_github_user(token)
|
user_data = get_github_user(token)
|
||||||
|
if not user_data:
|
||||||
|
return render_page_template('githuberror.html', error_message='Could not load user data')
|
||||||
|
|
||||||
github_id = user_data['id']
|
github_id = user_data['id']
|
||||||
user_obj = current_user.db_user()
|
user_obj = current_user.db_user()
|
||||||
model.attach_federated_login(user_obj, 'github', github_id)
|
model.attach_federated_login(user_obj, 'github', github_id)
|
||||||
|
|
Reference in a new issue