minimalist_authentication 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d04ae5c32012e31770d8993023ef3d68e109118249bd91031b0888bc06cc9c87
-  data.tar.gz: f115956d42f256ddafd2f1328c688ba3a72a2e447a4bd34a182e1034d0df9d29
+  metadata.gz: bd72c9f17536ef24bfc7d134733d03a00f1c235d5708b01dc2d5f415a484a688
+  data.tar.gz: 0501ccbf2663bf59d5a18ebb45566de7e04739b48ebda46ce6f0a5efa5ff0c78
 SHA512:
-  metadata.gz: 43a655bede1179250c8f43410b239a4ae23ca07a80a0e7c2e65f0903ea9bf07772565026dc7b254c116f42682572a305e7bcd21a35a1049bde548fb48adddb99
-  data.tar.gz: dbf795a8be4b6fe6e6fc6f10b17f7d12587aa15db58232f4d3bd87c985ce4f7a9d43cbe5b8d9451b227524ce477597b8f0d1bec67e24e94d374f57e769923bf0
+  metadata.gz: a1bb394153abcb693310c2d78a0d75385730accf41296e0871a86f15522a37db365bf09b41f94e092f4ab50be37b26765c0d91f93b88fcee6555d8737c4c38ab
+  data.tar.gz: aa4b2745cb630582b9c86a42aead66bd12b3be68d14c64f13d99f8cbbbd50423fc9820ba76bf84093503d84746d7046bb3823e421c3dc9d764f13e130c94f9d2

data/app/controllers/password_resets_controller.rb

@@ -15,16 +15,17 @@ class PasswordResetsController < ApplicationController
       MinimalistAuthenticationMailer.update_password(user).deliver_now
     end
     # always display notice even if the user was not found to prevent leaking user emails
-    redirect_to new_session_path, notice: "Password reset instructions were mailed to #{email_params[:email]}"
+    redirect_to new_session_path, notice: "Password reset instructions were mailed to #{email}"
   end
 
   private
 
   def user
-    @user ||= MinimalistAuthentication.configuration.user_model.active.email_verified.find_by(email_params)
+    return unless URI::MailTo::EMAIL_REGEXP.match?(email)
+    @user ||= MinimalistAuthentication.configuration.user_model.active.email_verified.find_by(email: email)
   end
 
-  def email_params
-    params.require(:user).permit(:email)
+  def email
+    params.require(:user).fetch(:email)
   end
 end

data/lib/minimalist_authentication/controller.rb

@@ -17,7 +17,8 @@ module MinimalistAuthentication
     end
 
     def get_user_from_session
-      MinimalistAuthentication.configuration.user_model.find_by_id(session_user_id) if session_user_id
+      return unless session_user_id
+      MinimalistAuthentication.configuration.user_model.active.find_by(id: session_user_id)
     end
 
     def session_user_id

data/lib/minimalist_authentication/user.rb

@@ -5,7 +5,6 @@ module MinimalistAuthentication
     extend ActiveSupport::Concern
 
     GUEST_USER_EMAIL  = 'guest'
-    EMAIL_REGEX       = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
     PASSWORD_MIN      = 8
     PASSWORD_MAX      = 40
 
@@ -20,14 +19,22 @@ module MinimalistAuthentication
       before_save :hash_password
 
       # Email validations
-      validates_presence_of     :email,                                           if: :validate_email_presence?
-      validates_uniqueness_of   :email, allow_blank: true, case_sensitive: false, if: :validate_email?
-      validates_format_of       :email, allow_blank: true, with: EMAIL_REGEX,     if: :validate_email?
+      validates(
+        :email,
+        format:     { allow_blank: true, with: URI::MailTo::EMAIL_REGEXP },
+        uniqueness: { allow_blank: true, case_sensitive: false, scope: :active },
+        if:         :validate_email?
+      )
+      validates(:email, presence: true, if: :validate_email_presence?)
 
       # Password validations
-      validates_presence_of     :password,                                      if: :validate_password?
-      validates_confirmation_of :password,                                      if: :validate_password?
-      validates_length_of       :password, within: PASSWORD_MIN..PASSWORD_MAX,  if: :validate_password?
+      validates(
+        :password,
+        confirmation: true,
+        length:       { within: PASSWORD_MIN..PASSWORD_MAX },
+        presence:     true,
+        if:           :validate_password?
+      )
 
       # Active scope
       scope :active,    ->(state = true)  { where(active: state) }

data/lib/minimalist_authentication/version.rb

@@ -1,3 +1,3 @@
 module MinimalistAuthentication
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimalist_authentication
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: A Rails authentication plugin that takes a minimalist approach.