Merge branch 'master' of https://bitbucket.org/yackob03/quay

2013-12-18 23:03:32 -05:00 · 2013-12-18 23:03:32 -05:00 · 5778076abb
commit 5778076abb
parent ed82d65dd1 dec74fc608
6 changed files with 21 additions and 8 deletions
--- a/endpoints/web.py
+++ b/endpoints/web.py
@ -226,7 +226,11 @@ def github_oauth_callback():
@app.route('/confirm', methods=['GET'])
 def confirm_email():
  code = request.values['code']
-  user = model.confirm_user_email(code)
+
+  try:
+    user = model.confirm_user_email(code)
+  except model.DataModelException as ex:
+    return redirect(url_for('signin'))

  common_login(user)