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

Merge pull request #3842 from alphagov/remove-last-of-the-backwards-compat-invite-stuff

Browse Source 
Remove last of the backwards compat invite stuff
This commit is contained in:
Leo Hemsted
2021-03-18 16:46:01 +00:00
committed by GitHub
parent 2a7f972a8a 0d350bdaf8
commit 62ce3c0696
5 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/dashboard.py
View File

@@ -49,8 +49,7 @@ def old_service_dashboard(service_id):
@user_has_permissions()
def service_dashboard(service_id):
if session.get('invited_user_id') or session.get('invited_user'):
session.pop('invited_user', None)
if session.get('invited_user_id'):
session.pop('invited_user_id', None)
session['service_id'] = service_id

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

@@ -39,7 +39,6 @@ def accept_invite(token):
service_name=service.name)
if invited_user.status == 'accepted':
session.pop('invited_user', None)
session.pop('invited_user_id', None)
service = Service.from_id(invited_user.service)
if service.has_permission('broadcast'):
@@ -103,7 +102,6 @@ def accept_org_invite(token):
organisation_name=organisation.name)
if invited_org_user.status == 'accepted':
session.pop('invited_org_user', None)
session.pop('invited_org_user_id', None)
return redirect(url_for('main.organisation_dashboard', org_id=invited_org_user.organisation))

3
app/main/views/sign_in.py
View File

@@ -36,11 +36,10 @@ def sign_in():
if user and user.state == 'pending':
return redirect(url_for('main.resend_email_verification', next=redirect_url))
if user and (session.get('invited_user') or session.get('invited_user_id')):
if user and session.get('invited_user_id'):
invited_user = InvitedUser.from_session()
if user.email_address.lower() != invited_user.email_address.lower():
flash("You cannot accept an invite for another person.")
session.pop('invited_user', None)
session.pop('invited_user_id', None)
abort(403)
else: