From c2ec1ea7f5e03b774139840c38a1b6e6255fe964 Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 12:29:21 -0800 Subject: [PATCH 1/7] Remove archaic email validation --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index 31ed8c2c..48033c05 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - validates :email, :email => email_validation if email_validation # use rails_email_validator or similar + # validates :email, :email => email_validation if email_validation # use rails_email_validator or similar validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password From 53346e1e1abdd1fdd3b935476f3ac9dc47de8189 Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 12:34:52 -0800 Subject: [PATCH 2/7] Add up-to-date email validation --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index 48033c05..953a3a09 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - # validates :email, :email => email_validation if email_validation # use rails_email_validator or similar + validates_format_of :email, :with => Devise.email_regexp # use rails_email_validator or similar validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password From d778aa9eb5fe983625160273c51a2cd21ebf21d9 Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 12:51:17 -0800 Subject: [PATCH 3/7] Remove nonsensicle comment --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index 953a3a09..7b9775cd 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - validates_format_of :email, :with => Devise.email_regexp # use rails_email_validator or similar + validates_format_of :email, :with => Devise.email_regexp validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password From 62119207eecb7362ba42b994ae0670fd6b197de1 Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 13:15:39 -0800 Subject: [PATCH 4/7] Clean up syntax --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index 7b9775cd..185c3dda 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - validates_format_of :email, :with => Devise.email_regexp + validates :email, :format => { :with => Devise.email_regex }, if => :email_required? validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password From eb19158c190c11867fa9925adffd687dda3dcbf4 Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 13:22:13 -0800 Subject: [PATCH 5/7] Fix syntax error --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index 185c3dda..cb0d626b 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - validates :email, :format => { :with => Devise.email_regex }, if => :email_required? + validates :email, :format => { :with => Devise.email_regex }, :if => :email_required? validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password From fe5eb0cfa83fd0ba50ef3c63143b0bb750f60d52 Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 13:35:29 -0800 Subject: [PATCH 6/7] Fix another syntax error --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index cb0d626b..03c7d1a7 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - validates :email, :format => { :with => Devise.email_regex }, :if => :email_required? + validates :email, :format => { :with => Devise.email_regexp }, if => :email_required? validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password From 75c0d7b83ca2c4a3b08efa18871fd6a0ec72e70f Mon Sep 17 00:00:00 2001 From: Ian McKenzie Date: Thu, 7 Dec 2017 13:36:43 -0800 Subject: [PATCH 7/7] Fix another syntax error --- lib/devise_security_extension/models/secure_validatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise_security_extension/models/secure_validatable.rb b/lib/devise_security_extension/models/secure_validatable.rb index 03c7d1a7..196f29dc 100644 --- a/lib/devise_security_extension/models/secure_validatable.rb +++ b/lib/devise_security_extension/models/secure_validatable.rb @@ -42,7 +42,7 @@ def self.included(base) end # extra validations - validates :email, :format => { :with => Devise.email_regexp }, if => :email_required? + validates :email, :format => { :with => Devise.email_regexp }, :if => :email_required? validates :password, :format => { :with => password_regex, :message => :password_format }, :if => :password_required? # don't allow use same password