nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace attribute_changed? with new methods

Browse source
This commit is contained in:
Benjamin Neff 2017-08-05 22:45:11 +02:00
parent e076910b74
commit 6e4c5bae29
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/user.rb
View file

@ -473,14 +473,17 @@ class User < ApplicationRecord
def guard_unconfirmed_email def guard_unconfirmed_email
self.unconfirmed_email = nil if unconfirmed_email.blank? || unconfirmed_email == email self.unconfirmed_email = nil if unconfirmed_email.blank? || unconfirmed_email == email
if unconfirmed_email_changed? return unless will_save_change_to_unconfirmed_email?
self.confirm_email_token = unconfirmed_email ? SecureRandom.hex(15) : nil self.confirm_email_token = unconfirmed_email ? SecureRandom.hex(15) : nil
end end
end
# Whenever email is set, clear all unconfirmed emails which match # Whenever email is set, clear all unconfirmed emails which match
def remove_invalid_unconfirmed_emails def remove_invalid_unconfirmed_emails
User.where(unconfirmed_email: email).update_all(unconfirmed_email: nil, confirm_email_token: nil) if email_changed? return unless saved_change_to_email?
# rubocop:disable Rails/SkipsModelValidations
User.where(unconfirmed_email: email).update_all(unconfirmed_email: nil, confirm_email_token: nil)
# rubocop:enable Rails/SkipsModelValidations
end end
# Generate public/private keys for User and associated Person # Generate public/private keys for User and associated Person