Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

css: Fix spilling out of long email on email change confirmation. 

In the email change confirmation page, now long emails break to
multiple lines instead of spilling out.

Fixes #23654.
This commit is contained in:
Ujjawal Modi 2022-11-28 03:39:11 +05:30 committed by Tim Abbott
parent 911b3b5365
commit 35f05631dd
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/styles/portico/portico_signin.css
View File

@ -737,6 +737,7 @@ html {
.confirm-email-change-page .white-box {
max-width: 500px;
word-break: break-word;
}
.anonymous_access_form {

11
zerver/tests/test_email_change.py
View File

@ -1,8 +1,10 @@
import datetime
from email.headerregistry import Address
from unittest import mock
from django.conf import settings
from django.core import mail
from django.utils.html import escape
from django.utils.timezone import now
from confirmation.models import (
@ -95,7 +97,8 @@ class EmailChangeTestCase(ZulipTestCase):
)
old_email = user_profile.delivery_email
new_email = "hamlet-new@zulip.com"
new_email = '"<li>hamlet-new<li>"@zulip.com'
new_email_address = Address(addr_spec=new_email)
new_realm = get_realm("zulip")
self.login("hamlet")
obj = EmailChangeStatus.objects.create(
@ -109,7 +112,11 @@ class EmailChangeTestCase(ZulipTestCase):
self.assertEqual(response.status_code, 200)
self.assert_in_success_response(
["This confirms that the email address for your Zulip"], response
[
"This confirms that the email address for your Zulip",
f'<a href="mailto:{escape(new_email)}">{escape(new_email_address.username)}@<wbr>{escape(new_email_address.domain)}</wbr></a>',
],
response,
)
user_profile = get_user_by_delivery_email(new_email, new_realm)
self.assertTrue(bool(user_profile))

8
zerver/views/user_settings.py
View File

@ -1,3 +1,4 @@
from email.headerregistry import Address
from typing import Any, Dict, Optional
from django.conf import settings
@ -96,13 +97,14 @@ def confirm_email_change(request: HttpRequest, confirmation_key: str) -> HttpRes
context=context,
realm=user_profile.realm,
)
old_email_address = Address(addr_spec=old_email)
new_email_address = Address(addr_spec=new_email)
ctx = {
"new_email_html_tag": SafeString(
f'<a href="mailto:{escape(new_email)}">{escape(new_email)}</a>'
f'<a href="mailto:{escape(new_email)}">{escape(new_email_address.username)}@<wbr>{escape(new_email_address.domain)}</wbr></a>'
),
"old_email_html_tag": SafeString(
f'<a href="mailto:{escape(old_email)}">{escape(old_email)}</a>'
f'<a href="mailto:{escape(old_email)}">{escape(old_email_address.username)}@<wbr>{escape(old_email_address.domain)}</wbr></a>'
),
}
return render(request, "confirmation/confirm_email_change.html", context=ctx)