authentication-zero 2.12.4 → 2.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e153855bfc24252626eb9ccb0381fadf99eda55f66db6d80081de90ea07eede5
-  data.tar.gz: a0fe741b9b4c073401fea77218fcfb2b7665041a073655bce689d0b84f5ee6ca
+  metadata.gz: 56295ed54d4a467ec1245634e3ab828d5128c601805bdaff0f232f9cd69ed08e
+  data.tar.gz: c8789b35631e6f4be5c6ba3f666eaa997f5dcdca2c23ba23fe013b0f55d36e2c
 SHA512:
-  metadata.gz: 661fa249b995fd6c7e0076a480597c972178a9f05231ff271fc4ecd6e24916f7d0eda5a428d4e4251c2fc0c29de6ea4b8c902f1f3665557bf15e6e2aa5897533
-  data.tar.gz: 699dc8d96580ba018fd238ff843ceed4d07a0b623f7b3dedd8ec88db2a2fa886025f26e8b5d526a817c0209d80db9a2b0bca0bdcb8c5f3122d10017d45e0b6f0
+  metadata.gz: 31e6c3963edabe40e298b758d4295ab03f13960aa5dae81089f4f2c3769589c45b56b2a4cd2c7faad373b681b03c5f52a90bb4a55696d64c203c6ae60b860ca0
+  data.tar.gz: 6cebd96d1801c3d53de594d16d8b9864683acd1b4a176cf6c7bcf6f706e57a8a8865c845ae9faa793070ebff733436bd48bca65f52d21e4dcce660861960fe63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (2.12.4)
+    authentication-zero (2.12.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.12.4"
+  VERSION = "2.12.5"
 end

data/lib/generators/authentication/templates/controllers/api/identity/email_verifications_controller.rb.tt

@@ -8,7 +8,7 @@ class Identity::EmailVerificationsController < ApplicationController
   end
 
   def create
-    UserMailer.with(user: Current.user).email_verify_confirmation.deliver_later
+    UserMailer.with(user: Current.user).email_confirmation.deliver_later
   end
 
   private
@@ -22,7 +22,7 @@ class Identity::EmailVerificationsController < ApplicationController
         render json: { error: "That email verification code is invalid" }, status: :bad_request
       end
     <%- else -%>
-      @user = User.where(email: params[:email]).find_signed!(params[:token], purpose: params[:email])
+      @user = User.where(email: params[:email]).find_signed!(params[:token], purpose: "verify_#{params[:email]}")
     rescue
       render json: { error: "That email verification link is invalid" }, status: :bad_request
     <%- end -%>

data/lib/generators/authentication/templates/controllers/api/identity/password_resets_controller.rb.tt

@@ -8,7 +8,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   def create
     if @user = User.find_by(email: params[:email], verified: true)
-      UserMailer.with(user: @user).password_reset_provision.deliver_later
+      UserMailer.with(user: @user).password_reset.deliver_later
     else
       render json: { error: "You can't reset your password until you verify your email" }, status: :not_found
     end

data/lib/generators/authentication/templates/controllers/html/identity/email_verifications_controller.rb.tt

@@ -9,13 +9,13 @@ class Identity::EmailVerificationsController < ApplicationController
   end
 
   def create
-    UserMailer.with(user: Current.user).email_verify_confirmation.deliver_later
+    UserMailer.with(user: Current.user).email_confirmation.deliver_later
     redirect_to root_path, notice: "We sent a verification email to your email address"
   end
 
   private
     def set_user
-      @user = User.where(email: params[:email]).find_signed!(params[:token], purpose: params[:email])
+      @user = User.where(email: params[:email]).find_signed!(params[:token], purpose: "verify_#{params[:email]}")
     rescue
       redirect_to edit_identity_email_path, alert: "That email verification link is invalid"
     end

data/lib/generators/authentication/templates/controllers/html/identity/password_resets_controller.rb.tt

@@ -14,7 +14,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   def create
     if @user = User.find_by(email: params[:email], verified: true)
-      UserMailer.with(user: @user).password_reset_provision.deliver_later
+      UserMailer.with(user: @user).password_reset.deliver_later
       redirect_to sign_in_path, notice: "Check your email for reset instructions"
     else
       redirect_to new_identity_password_reset_path, alert: "You can't reset your password until you verify your email"

data/lib/generators/authentication/templates/mailers/user_mailer.rb.tt

@@ -1,17 +1,17 @@
 class UserMailer < ApplicationMailer
-  def password_reset_provision
+  def password_reset
     @user = params[:user]
     @signed_id = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
 
     mail to: @user.email, subject: "Reset your password"
   end
 
-  def email_verify_confirmation
+  def email_confirmation
     @user = params[:user]
     <%- if code_verifiable? -%>
     @user.verification_code.value = rand.to_s[2..7]
     <%- else -%>
-    @signed_id = @user.signed_id(purpose: @user.email, expires_in: 2.days)
+    @signed_id = @user.signed_id(purpose: "verify_#{@user.email}", expires_in: 2.days)
     <%- end -%>
 
     mail to: @user.email, subject: "Verify your email"

data/lib/generators/authentication/templates/models/user.rb.tt

@@ -28,7 +28,7 @@ class User < ApplicationRecord
   end
 
   after_save_commit if: :email_previously_changed? do
-    UserMailer.with(user: self).email_verify_confirmation.deliver_later
+    UserMailer.with(user: self).email_confirmation.deliver_later
   end
   <%- if options.trackable? %>
   after_save_commit if: :email_previously_changed? do

data/lib/generators/authentication/templates/test_unit/controllers/api/identity/email_verifications_controller_test.rb.tt

@@ -3,8 +3,8 @@ require "test_helper"
 class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   setup do
     @user, @token = sign_in_as(users(:lazaro_nixon))
-    @sid = @user.signed_id(purpose: @user.email, expires_in: 20.minutes)
-    @sid_exp = @user.signed_id(purpose: @user.email, expires_in: 0.minutes)
+    @sid = @user.signed_id(purpose: "verify_#{@user.email}", expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: "verify_#{@user.email}", expires_in: 0.minutes)
 
     @user.update! verified: false
   end
@@ -14,7 +14,7 @@ class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should send a verification email" do
-    assert_enqueued_email_with UserMailer, :email_verify_confirmation, args: { user: @user } do
+    assert_enqueued_email_with UserMailer, :email_confirmation, args: { user: @user } do
       post identity_email_verification_url, headers: default_headers
     end
 

data/lib/generators/authentication/templates/test_unit/controllers/api/identity/password_resets_controller_test.rb.tt

@@ -8,7 +8,7 @@ class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with UserMailer, :password_reset_provision, args: { user: @user } do
+    assert_enqueued_email_with UserMailer, :password_reset, args: { user: @user } do
       post identity_password_reset_url, params: { email: @user.email }
     end
 

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/email_verifications_controller_test.rb.tt

@@ -3,14 +3,14 @@ require "test_helper"
 class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   setup do
     @user = sign_in_as(users(:lazaro_nixon))
-    @sid = @user.signed_id(purpose: @user.email, expires_in: 20.minutes)
-    @sid_exp = @user.signed_id(purpose: @user.email, expires_in: 0.minutes)
+    @sid = @user.signed_id(purpose: "verify_#{@user.email}", expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: "verify_#{@user.email}", expires_in: 0.minutes)
 
     @user.update! verified: false
   end
 
   test "should send a verification email" do
-    assert_enqueued_email_with UserMailer, :email_verify_confirmation, args: { user: @user } do
+    assert_enqueued_email_with UserMailer, :email_confirmation, args: { user: @user } do
       post identity_email_verification_url
     end
 

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/password_resets_controller_test.rb.tt

@@ -18,7 +18,7 @@ class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with UserMailer, :password_reset_provision, args: { user: @user } do
+    assert_enqueued_email_with UserMailer, :password_reset, args: { user: @user } do
       post identity_password_reset_url, params: { email: @user.email }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.12.5
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -70,10 +70,10 @@ files:
 - lib/generators/authentication/templates/erb/sessions/sudos/new.html.erb.tt
 - lib/generators/authentication/templates/erb/two_factor_authentication/challenges/new.html.erb.tt
 - lib/generators/authentication/templates/erb/two_factor_authentication/totps/new.html.erb.tt
-- lib/generators/authentication/templates/erb/user_mailer/email_verify_confirmation.html.erb.tt
-- lib/generators/authentication/templates/erb/user_mailer/email_verify_confirmation.text.erb.tt
-- lib/generators/authentication/templates/erb/user_mailer/password_reset_provision.html.erb.tt
-- lib/generators/authentication/templates/erb/user_mailer/password_reset_provision.text.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/email_confirmation.html.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/email_confirmation.text.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/password_reset.html.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/password_reset.text.erb.tt
 - lib/generators/authentication/templates/mailers/session_mailer.rb.tt
 - lib/generators/authentication/templates/mailers/user_mailer.rb.tt
 - lib/generators/authentication/templates/migrations/create_events_migration.rb.tt