darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-05 16:38:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4184 from alphagov/simplify-session-clear

Browse Source 
Simplify "activate_user" to clear session earlier
This commit is contained in:
Ben Thorner
2022-03-15 13:07:53 +00:00
committed by GitHub
parent 4903e9d60e 8d5974eb47
commit 6a2367bb72
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,8 @@ def verify():
form = TwoFactorForm(_check_code)
if form.validate_on_submit():
try:
return activate_user(user_id)
finally:
session.pop('user_details', None)
session.pop('user_details', None)
return activate_user(user_id)
return render_template('views/two-factor-sms.html', form=form)
@@ -62,15 +60,12 @@ def verify_email(token):
flash("That verification link has expired.")
return redirect(url_for('main.sign_in'))
session['user_details'] = {"email": user.email_address, "id": user.id}
if user.email_auth:
try:
return activate_user(user.id)
finally:
session.pop('user_details', None)
session.pop('user_details', None)
return activate_user(user.id)
user.send_verify_code()
session['user_details'] = {"email": user.email_address, "id": user.id}
return redirect(url_for('main.verify'))
@@ -95,7 +90,7 @@ def activate_user(user_id):
invited_org_user = InvitedOrgUser.from_session()
if invited_org_user:
user_api_client.add_user_to_organisation(invited_org_user.organisation, session['user_details']['id'])
user_api_client.add_user_to_organisation(invited_org_user.organisation, user_id)
if organisation_id:
return redirect(url_for('main.organisation_dashboard', org_id=organisation_id))