Merge pull request #32281 from owncloud/stable10-validate-email-regex

[stable10] Backport of Change regex to accept subdomains with hyphens.
owncloud · Aug 9, 2018 · 94a0923 · 94a0923
2 parents 90ab9f7 + 70c3694
commit 94a0923
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/core/js/sharedialogmailview.js b/core/js/sharedialogmailview.js
@@ -137,7 +137,7 @@
 			if (email.length === 0)
 				return true
 
-			return email.match(/([\w\.\-_]+)?\w+@[\w-_]+(\.\w+){1,}$/);
+			return email.match(/^[A-Za-z0-9\._%+-]+@(?:[A-Za-z0-9-]+\.)+[a-z]{2,}$/);
 		},
 
 		sendEmails: function() {

diff --git a/core/js/tests/specs/sharedialogmailviewSpec.js b/core/js/tests/specs/sharedialogmailviewSpec.js
@@ -100,6 +100,19 @@ describe('OC.Share.ShareDialogMailView', function() {
 		});
 	});
 
+	describe('validating addresses', function() {
+		it('works as expected', function() {
+			expect(view.validateEmail('[email protected]')[0]).toEqual('[email protected]');
+			expect(view.validateEmail('[email protected]')[0]).toEqual('[email protected]');
+			expect(view.validateEmail('[email protected]')[0]).toEqual('[email protected]');
+			expect(view.validateEmail('[email protected]')[0]).toEqual('[email protected]');
+
+			expect(view.validateEmail('[email protected]')).toEqual(null);
+			expect(view.validateEmail('Jill.Valentine@um#rella.com')).toEqual(null);
+			expect(view.validateEmail('Jürgen.Sö[email protected]')).toEqual(null);
+		});
+	});
+
 	describe('sending emails', function() {
 		var clock;