mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-05 16:38:26 -04:00
Merge pull request #507 from alphagov/fix-anchor-tag-in-flash
Fix anchor tag in flash message.
This commit is contained in:
@@ -6,6 +6,7 @@ from flask import (
|
|||||||
render_template,
|
render_template,
|
||||||
abort
|
abort
|
||||||
)
|
)
|
||||||
|
from markupsafe import Markup
|
||||||
|
|
||||||
from app.main import main
|
from app.main import main
|
||||||
|
|
||||||
@@ -24,14 +25,16 @@ def accept_invite(token):
|
|||||||
invited_user = invite_api_client.check_token(token)
|
invited_user = invite_api_client.check_token(token)
|
||||||
|
|
||||||
if not current_user.is_anonymous() and current_user.email_address != invited_user.email_address:
|
if not current_user.is_anonymous() and current_user.email_address != invited_user.email_address:
|
||||||
flash("""
|
message = Markup("""
|
||||||
You’re signed in as {}.
|
You’re signed in as {}.
|
||||||
This invite is for another email address.
|
This invite is for another email address.
|
||||||
<a href='{}'>Sign out</a> and click the link again to accept this invite.
|
<a href={}>Sign out</a> and click the link again to accept this invite.
|
||||||
""".format(
|
""".format(
|
||||||
current_user.email_address,
|
current_user.email_address,
|
||||||
url_for("main.sign_out")
|
url_for("main.sign_out", _external=True)))
|
||||||
))
|
|
||||||
|
flash(message=message)
|
||||||
|
|
||||||
abort(403)
|
abort(403)
|
||||||
|
|
||||||
if invited_user.status == 'cancelled':
|
if invited_user.status == 'cancelled':
|
||||||
|
|||||||
@@ -287,7 +287,7 @@ def test_signed_in_existing_user_cannot_use_anothers_invite(app_,
|
|||||||
banner_contents = flash_banners[0].text.strip()
|
banner_contents = flash_banners[0].text.strip()
|
||||||
assert "You’re signed in as test@user.gov.uk." in banner_contents
|
assert "You’re signed in as test@user.gov.uk." in banner_contents
|
||||||
assert "This invite is for another email address." in banner_contents
|
assert "This invite is for another email address." in banner_contents
|
||||||
assert "<a href='/sign-out'>Sign out</a> and click the link again to accept this invite." in banner_contents
|
assert "Sign out and click the link again to accept this invite." in banner_contents
|
||||||
assert mock_accept_invite.call_count == 0
|
assert mock_accept_invite.call_count == 0
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user