minimalist_authentication 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d61a668a0923babb9c46da034f262af4dc8ed449b511bb44427b2c1af202c4
-  data.tar.gz: b6e226a4f03b89609870b4841bfa83cbb781eb3b1ffc2c7d201c4e99328a4921
+  metadata.gz: 81a22051077302595ad7912895d76c53f850e9b29e1dab723fdae137fefea9ac
+  data.tar.gz: 6c5343b7605ca25829c7744ffff968389d8cf306dd3bb4fe7d368ed226e87995
 SHA512:
-  metadata.gz: '09a6e851dd57f8541116348298da3e1d5b2227f40a03ae3aed99a75040b30d237f5641741bfbad5b2fee73daaf9e1f2951634f263adc2a4827dc3bf5220307d7'
-  data.tar.gz: d47f8f2afa9464bce14cc503a64850dacf774bdd50ca965f4077e808afbb51f6ee8e4f1dc4877a9769fac7ff26b19cb77a6ad05828564a9436a692730be83a2f
+  metadata.gz: 0b6b0e178491e11fc0337068aa5c21b02644ec716fd5d8818f9d0598e40cc6d476f3285f8ef8d8c193f0342debd32460edca76d578d27e16f79d5ea333a36389
+  data.tar.gz: 53f72000d43f6620d061f96c65274dc710a853f8ec58ebcd1cc42f46d95de31c4ff989d635077b0315baeb539d2a653dcd68c0335e940c71631884e3572136cf

data/app/controllers/password_resets_controller.rb

@@ -37,7 +37,7 @@ class PasswordResetsController < ApplicationController
   end
 
   def user
-    MinimalistAuthentication.user_model.active.find_by(email:)
+    MinimalistAuthentication.user_model.find_enabled_by(email:)
   end
 
   def email_valid?

data/app/helpers/minimalist_authentication/application_helper.rb

@@ -30,6 +30,10 @@ module MinimalistAuthentication
       )
     end
 
+    def ma_email_verification_button(**)
+      button_to(t(".button"), email_verification_path, **)
+    end
+
     def ma_forgot_password_link
       link_to(t(".forgot_password"), new_password_reset_path)
     end
@@ -40,7 +44,7 @@ module MinimalistAuthentication
         options.reverse_merge(
           autocomplete: "new-password",
           minlength:    MinimalistAuthentication.user_model.password_minimum,
-          placeholder:  true,
+          placeholder:  "New password",
           required:     true
         )
       )
@@ -72,5 +76,9 @@ module MinimalistAuthentication
         )
       )
     end
+
+    def ma_verification_message(user = current_user)
+      render(user.email_verified? ? "verified" : "unverified")
+    end
   end
 end

data/app/views/email_verifications/_unverified.html.erb

@@ -0,0 +1 @@
+<h2><%= t(".message") %></h2>

data/app/views/email_verifications/_verified.html.erb

@@ -0,0 +1 @@
+<h2><%= t(".message") %></h2>

data/app/views/email_verifications/new.html.erb

@@ -1,12 +1,14 @@
-<h2><%= t(".title") %></h2>
+<h1><%= t(".title") %></h1>
+
+<h2><%= t(".instructions") %></h2>
+
+<p><%= t(".message") %></p>
 
 <p>
   <strong><%= current_user.email %></strong>
   <em><%= ma_change_email_link %></em>
 </p>
 
-<%= button_to t(".button"), email_verification_path %>
-
-<p><%= t(".message") %></p>
+<%= ma_email_verification_button %>
 
 <%= ma_skip_link %>

data/app/views/email_verifications/show.html.erb

@@ -1,10 +1,6 @@
-<h1>Email Verification</h1>
+<h1><%= t(".title") %></h1>
 
-<% if current_user.email_verified? %>
-  <h2>Your email address has been verified</h2>
-<% else %>
-  <h2>Email address verification failed</h2>
-<% end %>
-<h2><%= current_user.email %></h2>
+<%= ma_verification_message %>
+<p><%= current_user.email %></p>
 
 <%= link_to("Go to Dashboard", dashboard_path) %>

data/config/locales/minimalist_authentication.en.yml

@@ -4,8 +4,15 @@ en:
       notice: Verification email sent to %{email}, follow the instructions to complete verification. Thank you!
     new:
       button: Send Verification Email
+      instructions: Please verify your email address
       message: Verifying your email will allow you to receive confidential messages.
-      title: Please verify your email address
+      title: Email Verification
+    show:
+      title: Email Verification
+    unverified:
+      message: Email address verification failed
+    verified:
+      message: Your email address has been verified
   emails:
     edit:
       instructions: Please update your email address

data/lib/minimalist_authentication/user.rb

@@ -49,10 +49,15 @@ module MinimalistAuthentication
     module ClassMethods
       delegate :account_setup_duration, :password_reset_duration, to: "MinimalistAuthentication.configuration"
 
-      # Finds a user by their id and returns the user if they are enabled.
-      # Returns nil if the user is not found or not enabled.
+      # Finds an enabled user by id.
       def find_enabled(id)
-        find_by(id:)&.enabled if id.present?
+        find_enabled_by(id:) if id.present?
+      end
+
+      # Finds a user matching the specified conditions and returns the user if they are enabled.
+      # Returns nil if a user is not found or not enabled.
+      def find_enabled_by(**)
+        find_by(**)&.enabled
       end
 
       def inactive

data/lib/minimalist_authentication/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MinimalistAuthentication
-  VERSION = "3.4.1"
+  VERSION = "3.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimalist_authentication
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -10,6 +10,34 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -31,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.3
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -63,6 +91,8 @@ files:
 - app/mailers/application_mailer.rb
 - app/mailers/minimalist_authentication_mailer.rb
 - app/validators/password_exclusivity_validator.rb
+- app/views/email_verifications/_unverified.html.erb
+- app/views/email_verifications/_verified.html.erb
 - app/views/email_verifications/new.html.erb
 - app/views/email_verifications/show.html.erb
 - app/views/emails/edit.html.erb
@@ -112,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.2
 specification_version: 4
 summary: A Rails authentication plugin that takes a minimalist approach.
 test_files: []