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

Move the register code for github login to the actual registration part, not just login.

Browse source
This commit is contained in:
yackob03 2013-10-15 01:12:23 -04:00
parent 6d33b2af59
commit 13298be5d3
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
endpoints/web.py
View file

@ -128,15 +128,11 @@ def github_oauth_callback():
to_login = model.verify_federated_login('github', github_id)
if not to_login:
# try to create the user
try:
to_login = model.create_federated_user(username, found_email, 'github',
github_id)
except model.DataModelException, ex:
return render_template('githuberror.html', error_message=ex.message)
if common_login(to_login):
# Success
# Success, tell mixpanel
mixpanel.track(to_login.username, 'register', {'service': 'github'})
state = request.args.get('state', None)
@ -144,6 +140,10 @@ def github_oauth_callback():
logger.debug('Aliasing with state: %s' % state)
mixpanel.alias(to_login.username, state)
except model.DataModelException, ex:
return render_template('githuberror.html', error_message=ex.message)
if common_login(to_login):
return redirect(url_for('index'))
# TODO something bad happened, we need to tell the user somehow