diff options
| -rw-r--r-- | nexus/src/test/kotlin/SandboxCircuitApiTest.kt | 3 | ||||
| -rw-r--r-- | sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nexus/src/test/kotlin/SandboxCircuitApiTest.kt b/nexus/src/test/kotlin/SandboxCircuitApiTest.kt index 7818ff0c..72a942e3 100644 --- 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 index ef44e09c..956ccba7 100644 --- 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) } |