vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: handle tel: links in emails (#19635)

Browse source
This commit is contained in:
Ankush Menat 2023-01-17 20:31:06 +05:30 • committed by GitHub
parent f9496ff7e5
commit e31db5d502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
frappe/tests/test_utils.py
View file

@ -49,6 +49,7 @@ from frappe.utils.data import (
cast,
cstr,
duration_to_seconds,
expand_relative_urls,
get_datetime,
get_first_day_of_week,
get_time,
@ -920,6 +921,21 @@ class TestMiscUtils(FrappeTestCase):
self.assertEqual(safe_json_loads("{ /}"), "{ /}")
self.assertEqual(safe_json_loads("12"), 12) # this is a quirk
def test_url_expansion(self):
unchanged_links = [
"<a href='tel:12345432'>My Phone</a>)",
"<a href='mailto:hello@example.com'>My Email</a>)",
"<a href='data:hello@example.com'>Data</a>)",
]
for link in unchanged_links:
self.assertEqual(link, expand_relative_urls(link))
site = get_url()
transforms = [("<a href='/about'>About</a>)", f"<a href='{site}/about'>About</a>)")]
for input, output in transforms:
self.assertEqual(output, expand_relative_urls(input))
class TestTypingValidations(FrappeTestCase):
ERR_REGEX = f"^Argument '.*' should be of type '.*' but got '.*' instead.$"

2
frappe/utils/data.py
View file

@ -1885,7 +1885,7 @@ def expand_relative_urls(html: str) -> str:
def _expand_relative_urls(match):
to_expand = list(match.groups())
if not to_expand[2].startswith("mailto") and not to_expand[2].startswith("data:"):
if not to_expand[2].startswith(("mailto", "data:", "tel:")):
if not to_expand[2].startswith("/"):
to_expand[2] = "/" + to_expand[2]
to_expand.insert(2, url)