Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix EmailValidator regex

Piotr Milewskidbf5a9246078
diff --git a/core/app/validators/email_validator.rb b/core/app/validators/email_validator.rb
index 5a7822c6fe..2cbb091030 100644
--- a/core/app/validators/email_validator.rb
+++ b/core/app/validators/email_validator.rb
@@ -1,6 +1,6 @@
class EmailValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
- unless value =~ /\A[^@\s]+@[^@\s]+\z/
+ unless value =~ /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i
record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
end
end
diff --git a/core/spec/validators/email_validator_spec.rb b/core/spec/validators/email_validator_spec.rb
index a9dbcb4846..db4993b92c 100644
--- a/core/spec/validators/email_validator_spec.rb
+++ b/core/spec/validators/email_validator_spec.rb
@@ -30,7 +30,8 @@ describe EmailValidator do
'invalidemailemail.com',
'invalid@[email protected]',
- 'invalid.email@@email.com'
+ 'invalid.email@@email.com',
+ 'invalid@emailcom'
]
end