[SITES-23458] Button V2 Component Error with Callable Link (tel:) in … (

#2819) * [SITES-23458] Button V2 Component Error with Callable Link (tel:) in AEM as a Cloud Service * Fix variable name Co-authored-by: Igor Myronenko <[email protected]> --------- Co-authored-by: cioriia <[email protected]> Co-authored-by: Igor Myronenko <[email protected]>
adobe · Jul 19, 2024 · f7dc418 · f7dc418
1 parent b5e6a56
commit f7dc418
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtil.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtil.java
@@ -62,6 +62,9 @@ public class LinkUtil {
     }
 
     private static final String MAIL_TO_PATTERN = "mailto";
+
+    private static final String TEL_PATTERN = "tel";
+
     //SITES-18137: imitate the exact behavior of com.google.common.net.URL_FRAGMENT_ESCAPER
     private static final BitSet URL_FRAGMENT_SAFE_CHARS = new BitSet(256);
 
@@ -128,7 +131,7 @@ public static String escape(final String path, final String queryString, final S
             LOG.error(e.getMessage(), e);
         }
         try {
-            if (parsed != null && !isMailToLink(parsed.getScheme())) {
+            if (parsed != null && !isMailToLink(parsed.getScheme()) && !isTelLink(parsed.getScheme())) {
                 escaped = new URI(parsed.getScheme(), parsed.getAuthority(), parsed.getPath(), maskedQueryString, null).toString();
             } else {
                 escaped = new URI(null, null, path, maskedQueryString, null).toString();
@@ -276,4 +279,12 @@ private static boolean isMailToLink(String link) {
             return false;
         }
     }
+
+    private static boolean isTelLink(String link) {
+        if (link != null) {
+            return link.startsWith(TEL_PATTERN);
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtilTest.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtilTest.java
@@ -70,4 +70,11 @@ void escape_mailToLinkNotThrowException() throws UnsupportedEncodingException {
         String escapedMailTo = LinkUtil.escape(path, null, null);
         assertEquals(path, escapedMailTo);
     }
+
+    @Test
+    void escape_telLinkNotThrowException() throws UnsupportedEncodingException {
+        String path = "tel:1800";
+        String escapedTel = LinkUtil.escape(path, null, null);
+        assertEquals(path, escapedTel);
+    }
 }