mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 02:19:27 +08:00
6e2be3e60b
See https://meta.discourse.org/t/changing-a-users-email/164512 for additional context. Previously when an admin user changed a user's email we assumed that they would need a password reset too because they likely did not have access to their account. This proved to be incorrect, as there are other reasons a user needs admin to change their email. This PR: * Changes the admin change email for user flow so the user is sent an email to confirm the change * We now record who the email change request was requested by * If the requested by user is admin and not the user we note this in the email sent to the user * We also make the confirm change email route open to anonymous users, so it can be clicked by the user even if they do not have access to their account. If there is a logged in user we make sure the confirmation matches the current user.
50 lines
1.5 KiB
Ruby
50 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class EmailChangeRequest < ActiveRecord::Base
|
|
belongs_to :old_email_token, class_name: 'EmailToken'
|
|
belongs_to :new_email_token, class_name: 'EmailToken'
|
|
belongs_to :user
|
|
belongs_to :requested_by, class_name: "User", foreign_key: :requested_by_user_id
|
|
|
|
validates :new_email, presence: true, format: { with: EmailValidator.email_regex }
|
|
|
|
def self.states
|
|
@states ||= Enum.new(authorizing_old: 1, authorizing_new: 2, complete: 3)
|
|
end
|
|
|
|
def requested_by_admin?
|
|
self.requested_by.admin? && !self.requested_by_self?
|
|
end
|
|
|
|
def requested_by_self?
|
|
self.requested_by_user_id == self.user_id
|
|
end
|
|
|
|
def self.find_by_new_token(token)
|
|
joins(
|
|
"INNER JOIN email_tokens ON email_tokens.id = email_change_requests.new_email_token_id"
|
|
).where("email_tokens.token = ?", token).last
|
|
end
|
|
end
|
|
|
|
# == Schema Information
|
|
#
|
|
# Table name: email_change_requests
|
|
#
|
|
# id :integer not null, primary key
|
|
# user_id :integer not null
|
|
# old_email :string
|
|
# new_email :string not null
|
|
# old_email_token_id :integer
|
|
# new_email_token_id :integer
|
|
# change_state :integer not null
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# requested_by_user_id :integer
|
|
#
|
|
# Indexes
|
|
#
|
|
# idx_email_change_requests_on_requested_by (requested_by_user_id)
|
|
# index_email_change_requests_on_user_id (user_id)
|
|
#
|