darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 00:07:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Review comment fixes.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-28 11:34:15 +00:00
parent ca8d78aee5
commit e322a5f1c3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/main/views/two_factor.py
View File

@@ -20,13 +20,15 @@ def two_factor():
form = TwoFactorForm(_check_code) form = TwoFactorForm(_check_code)
if form.validate_on_submit(): if form.validate_on_submit():
user = users_dao.get_user_by_id(user_id) try:
# Check if coming from new password page user = users_dao.get_user_by_id(user_id)
if 'password' in session['user_details']: # Check if coming from new password page
user.set_password(session['user_details']['password']) if 'password' in session['user_details']:
users_dao.update_user(user) user.set_password(session['user_details']['password'])
del session['user_details'] users_dao.update_user(user)
login_user(user) login_user(user)
finally:
del session['user_details']
return redirect(url_for('.choose_service')) return redirect(url_for('.choose_service'))
return render_template('views/two-factor.html', form=form) return render_template('views/two-factor.html', form=form)

2
app/main/views/verify.py
View File

@@ -35,5 +35,7 @@ def verify():
abort(404) abort(404)
else: else:
raise e raise e
finally:
del session['user_details']
return render_template('views/verify.html', form=form) return render_template('views/verify.html', form=form)