From f4c9c359968796ef54f004e1651224a9c030d3c6 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 26 Apr 2017 11:01:18 +0200 Subject: [PATCH] added support for gtld email domains, see #909 --- .../test/java/sonia/scm/util/ValidationUtilTest.java | 3 +++ .../webapp/resources/js/override/ext.form.vtypes.js | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java index d64cb37457..3eaddf2d36 100644 --- a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java +++ b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java @@ -81,6 +81,9 @@ public class ValidationUtilTest assertTrue(ValidationUtil.isMailAddressValid("s.sdorra@t.co")); assertTrue(ValidationUtil.isMailAddressValid("s.sdorra@ucla.college")); assertTrue(ValidationUtil.isMailAddressValid("s.sdorra@example.xn--p1ai")); + + // issue 909 + assertTrue(ValidationUtil.isMailAddressValid("s.sdorra@scm.solutions")); // false assertFalse(ValidationUtil.isMailAddressValid("ostfalia.de")); diff --git a/scm-webapp/src/main/webapp/resources/js/override/ext.form.vtypes.js b/scm-webapp/src/main/webapp/resources/js/override/ext.form.vtypes.js index 91d5307577..eb751bbbb2 100644 --- a/scm-webapp/src/main/webapp/resources/js/override/ext.form.vtypes.js +++ b/scm-webapp/src/main/webapp/resources/js/override/ext.form.vtypes.js @@ -78,6 +78,14 @@ Ext.apply(Ext.form.VTypes, { return this.name(val); }, - usernameText: 'The username is invalid.' + usernameText: 'The username is invalid.', + + emailRegex: /^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]*\.[A-z0-9][A-z0-9-]+$/, + + // override extjs email format validation to match backend validation rules + // see https://bitbucket.org/sdorra/scm-manager/issues/909/new-gtld-support + email: function(email) { + return this.emailRegex.test(email); + } }); \ No newline at end of file