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

Change common_login to take in a user uuid, instead of a user DB object

Browse source
This commit is contained in:
Joseph Schorr 2017-07-20 15:40:14 -04:00
parent 7736de24fe
commit aecec02b6c
7 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/web.py
View file

@ -464,7 +464,7 @@ def confirm_email():
change_email_future = user_analytics.change_email(old_email, new_email)
change_email_future.add_done_callback(build_error_callback('Change email failed'))
common_login(user)
common_login(user.uuid)
if model.user.has_user_prompts(user):
return redirect(url_for('web.updateuser'))
elif new_email:
@ -481,7 +481,7 @@ def confirm_recovery():
user = model.user.validate_reset_code(code)
if user is not None:
common_login(user)
common_login(user.uuid)
return redirect(url_for('web.user_view', path=user.username, tab='settings', action='password'))
else:
message = 'Invalid recovery code: This code is invalid or may have already been used.'