commit a6dba8366ae28db07c96f9d166888003d5e92da1
parent 39c230e5d1f319ea1b4498e36eb71e8cec175c10
Author: MS <ms@taler.net>
Date: Thu, 25 May 2023 16:03:29 +0200
broadening accepted e-mail addresses
Diffstat:
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/nexus/src/test/kotlin/SandboxCircuitApiTest.kt b/nexus/src/test/kotlin/SandboxCircuitApiTest.kt
@@ -208,10 +208,11 @@ class SandboxCircuitApiTest {
assert(checkPhoneNumber("+4900"))
// E-mail address
assert(checkEmailAddress("test@example.com"))
- assert(!checkEmailAddress("0@0.0"))
assert(!checkEmailAddress("foo.bar"))
assert(checkEmailAddress("foo.bar@example.com"))
assert(!checkEmailAddress("foo+bar@example.com"))
+ assert(checkEmailAddress("admin@example.info"))
+ assert(checkEmailAddress("AdMiN@COM.example.INFO"))
}
@Test
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt
@@ -128,7 +128,7 @@ fun checkPhoneNumber(phoneNumber: String): Boolean {
fun checkEmailAddress(emailAddress: String): Boolean {
// From Taler TypeScript:
// /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
- val regex = "^[a-z0-9\\.]+@[a-z0-9\\.]+\\.[a-z]{2,3}$"
+ val regex = "^[a-zA-Z0-9\\.]+@[a-zA-Z0-9\\.]+$"
val R = Regex(regex)
return R.matches(emailAddress)
}