Add email component to webchat URNs

nyaruka · Jan 23, 2024 · 1387ca2 · 1387ca2
1 parent 9182672
commit 1387ca2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/urns/urns.go b/urns/urns.go
@@ -76,7 +76,7 @@ var viberRegex = regexp.MustCompile(`^[a-zA-Z0-9_=/+]{1,24}$`)
 var lineRegex = regexp.MustCompile(`^[a-zA-Z0-9_]{1,36}$`)
 var allDigitsRegex = regexp.MustCompile(`^[0-9]+$`)
 var freshchatRegex = regexp.MustCompile(`^[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}$`)
-var webchatRegex = regexp.MustCompile(`^[a-zA-Z0-9]{24}$`)
+var webchatRegex = regexp.MustCompile(`^[a-zA-Z0-9]{24}(:[^\s@]+@[^\s@]+)?$`)
 
 // URN represents a Universal Resource Name, we use this for contact identifiers like phone numbers etc..
 type URN string

diff --git a/urns/urns_test.go b/urns/urns_test.go
@@ -288,8 +288,10 @@ func TestValidate(t *testing.T) {
 		{"slack:U0123ABCDEF", ""},
 
 		{"webchat:aA3456789012345678901234", ""},
+		{"webchat:aA3456789012345678901234:[email protected]", ""},
 		{"webchat:1234567890123456789", "invalid webchat id"},
 		{"webchat:12345678901234567890123$", "invalid webchat id"},
+		{"webchat:aA3456789012345678901234:@@$", "invalid webchat id"},
 	}
 
 	for _, tc := range testCases {