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

move invite error handler to top level

Browse Source 
ensure we catch org errors as well as regular errors
This commit is contained in:
Leo Hemsted
2020-03-06 11:53:55 +00:00
parent be48f3bac5
commit 2d8d2d712a
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,16 +12,11 @@ from app.models.user import (
User,
Users,
)
from app.notify_client import InviteTokenError
@main.route("/invitation/<token>")
def accept_invite(token):
try:
invited_user = InvitedUser.from_token(token)
except InviteTokenError as exception:
flash(str(exception))
return redirect(url_for('main.sign_in'))
invited_user = InvitedUser.from_token(token)
if not current_user.is_anonymous and current_user.email_address.lower() != invited_user.email_address.lower():
message = Markup("""
@@ -78,6 +73,7 @@ def accept_invite(token):
@main.route("/organisation-invitation/<token>")
def accept_org_invite(token):
invited_org_user = InvitedOrgUser.from_token(token)
if not current_user.is_anonymous and current_user.email_address.lower() != invited_org_user.email_address.lower():
message = Markup("""
You’re signed in as {}.