mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-13 04:29:03 +01:00
09191dee66
It looks like a [bug](https://bugs.ruby-lang.org/issues/18633) around
autosplat is [fixed](fbaadd1cfe
)
on ruby-3.2.0-rc1 and breaks a test (but not on ruby <= 3.1.3):
```
$ bundle exec rspec ./spec/controllers/api/v1/emails/confirmations_controller_spec.rb:41
:
1) Api::V1::Emails::ConfirmationsController#create with an oauth token from an app that created the account when the account is already confirmed but user changed e-mail and has not confirmed it returns http success
Failure/Error:
def email_changed(user, **)
@resource = user
@instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
end
end
ArgumentError:
wrong number of arguments (given 2, expected 1)
# ./app/mailers/user_mailer.rb:51:in `email_changed'
# ./app/models/user.rb:444:in `render_and_send_devise_message'
# ./app/models/user.rb:430:in `block in send_pending_devise_notifications'
# ./app/models/user.rb:429:in `each'
# ./app/models/user.rb:429:in `send_pending_devise_notifications'
# ./spec/controllers/api/v1/emails/confirmations_controller_spec.rb:38:in `block (7 levels) in <top (required)>'
```
213 lines
6.1 KiB
Ruby
213 lines
6.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class UserMailer < Devise::Mailer
|
|
layout 'mailer'
|
|
|
|
helper :accounts
|
|
helper :application
|
|
helper :instance
|
|
helper :statuses
|
|
helper :formatting
|
|
|
|
helper RoutingHelper
|
|
|
|
def confirmation_instructions(user, token, *, **)
|
|
@resource = user
|
|
@token = token
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.unconfirmed_email.presence || @resource.email,
|
|
subject: I18n.t(@resource.pending_reconfirmation? ? 'devise.mailer.reconfirmation_instructions.subject' : 'devise.mailer.confirmation_instructions.subject', instance: @instance),
|
|
template_name: @resource.pending_reconfirmation? ? 'reconfirmation_instructions' : 'confirmation_instructions'
|
|
end
|
|
end
|
|
|
|
def reset_password_instructions(user, token, *, **)
|
|
@resource = user
|
|
@token = token
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
|
|
end
|
|
end
|
|
|
|
def password_change(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')
|
|
end
|
|
end
|
|
|
|
def email_changed(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
|
|
end
|
|
end
|
|
|
|
def two_factor_enabled(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_enabled.subject')
|
|
end
|
|
end
|
|
|
|
def two_factor_disabled(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_disabled.subject')
|
|
end
|
|
end
|
|
|
|
def two_factor_recovery_codes_changed(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')
|
|
end
|
|
end
|
|
|
|
def webauthn_enabled(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_enabled.subject')
|
|
end
|
|
end
|
|
|
|
def webauthn_disabled(user, *, **)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_disabled.subject')
|
|
end
|
|
end
|
|
|
|
def webauthn_credential_added(user, webauthn_credential)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
@webauthn_credential = webauthn_credential
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
|
|
end
|
|
end
|
|
|
|
def webauthn_credential_deleted(user, webauthn_credential)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
@webauthn_credential = webauthn_credential
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
|
|
end
|
|
end
|
|
|
|
def welcome(user)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('user_mailer.welcome.subject')
|
|
end
|
|
end
|
|
|
|
def backup_ready(user, backup)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
@backup = backup
|
|
|
|
return unless @resource.active_for_authentication?
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject')
|
|
end
|
|
end
|
|
|
|
def warning(user, warning)
|
|
@resource = user
|
|
@warning = warning
|
|
@instance = Rails.configuration.x.local_domain
|
|
@statuses = @warning.statuses.includes(:account, :preloadable_poll, :media_attachments, active_mentions: [:account])
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}")
|
|
end
|
|
end
|
|
|
|
def appeal_approved(user, appeal)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
@appeal = appeal
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('user_mailer.appeal_approved.subject', date: l(@appeal.created_at))
|
|
end
|
|
end
|
|
|
|
def appeal_rejected(user, appeal)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
@appeal = appeal
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('user_mailer.appeal_rejected.subject', date: l(@appeal.created_at))
|
|
end
|
|
end
|
|
|
|
def suspicious_sign_in(user, remote_ip, user_agent, timestamp)
|
|
@resource = user
|
|
@instance = Rails.configuration.x.local_domain
|
|
@remote_ip = remote_ip
|
|
@user_agent = user_agent
|
|
@detection = Browser.new(user_agent)
|
|
@timestamp = timestamp.to_time.utc
|
|
|
|
I18n.with_locale(locale) do
|
|
mail to: @resource.email, subject: I18n.t('user_mailer.suspicious_sign_in.subject')
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def locale
|
|
@resource.locale.presence || I18n.default_locale
|
|
end
|
|
end
|