From a0251255a731720bc379aecb6277868d7d74dffd Mon Sep 17 00:00:00 2001 From: "Stanko K.R." Date: Fri, 14 Nov 2025 12:36:24 +0100 Subject: [PATCH] Rename IdenityMailer to UserMailer --- app/mailers/{identity_mailer.rb => user_mailer.rb} | 2 +- app/models/user/email_address_changeable.rb | 2 +- .../email_change_confirmation.html.erb | 0 .../{identity_mailer_preview.rb => user_mailer_preview.rb} | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/mailers/{identity_mailer.rb => user_mailer.rb} (81%) rename app/views/{mailers/identity_mailer => user_mailer}/email_change_confirmation.html.erb (100%) rename test/mailers/previews/{identity_mailer_preview.rb => user_mailer_preview.rb} (74%) diff --git a/app/mailers/identity_mailer.rb b/app/mailers/user_mailer.rb similarity index 81% rename from app/mailers/identity_mailer.rb rename to app/mailers/user_mailer.rb index 1e988f2b0..f0716c4d1 100644 --- a/app/mailers/identity_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,4 +1,4 @@ -class IdentityMailer < ApplicationMailer +class UserMailer < ApplicationMailer def email_change_confirmation(email_address:, token:, user:) @token = token @user = user diff --git a/app/models/user/email_address_changeable.rb b/app/models/user/email_address_changeable.rb index 4d93553d0..ce18d46d0 100644 --- a/app/models/user/email_address_changeable.rb +++ b/app/models/user/email_address_changeable.rb @@ -25,7 +25,7 @@ module User::EmailAddressChangeable expires_in: EMAIL_CHANGE_TOKEN_EXPIRATION ) - IdentityMailer.email_change_confirmation( + UserMailer.email_change_confirmation( email_address: new_email_address, token: token, user: self diff --git a/app/views/mailers/identity_mailer/email_change_confirmation.html.erb b/app/views/user_mailer/email_change_confirmation.html.erb similarity index 100% rename from app/views/mailers/identity_mailer/email_change_confirmation.html.erb rename to app/views/user_mailer/email_change_confirmation.html.erb diff --git a/test/mailers/previews/identity_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb similarity index 74% rename from test/mailers/previews/identity_mailer_preview.rb rename to test/mailers/previews/user_mailer_preview.rb index 428c3e4be..b9c601916 100644 --- a/test/mailers/previews/identity_mailer_preview.rb +++ b/test/mailers/previews/user_mailer_preview.rb @@ -1,10 +1,10 @@ -class IdentityMailerPreview < ActionMailer::Preview +class UserMailerPreview < ActionMailer::Preview def email_change_confirmation new_email_address = "new.email@example.com" user = User.all.sample token = user.send(:generate_email_address_change_token, to: new_email_address) - IdentityMailer.email_change_confirmation( + UserMailer.email_change_confirmation( email_address: new_email_address, token: token, user: user