diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 18:13:55 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 18:24:01 +0100 |
commit | 61ef81c548a0140a80281d4004ac55873d8f74d6 (patch) | |
tree | 770c251059d139243b9cb557c762648e0af55037 /app/models/user.rb | |
parent | 4d0383d75ac606f8c9c2b8ecb0ea2dddf28213cb (diff) | |
parent | 0a120d86d28e3f2e20455f56c1656f5d5f2f4af6 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6673b3d2b..e47b5f135 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -10,7 +10,6 @@ # encrypted_password :string default(""), not null # reset_password_token :string # reset_password_sent_at :datetime -# remember_created_at :datetime # sign_in_count :integer default(0), not null # current_sign_in_at :datetime # last_sign_in_at :datetime @@ -32,7 +31,6 @@ # disabled :boolean default(FALSE), not null # moderator :boolean default(FALSE), not null # invite_id :bigint(8) -# remember_token :string # chosen_languages :string is an Array # created_by_application_id :bigint(8) # approved :boolean default(TRUE), not null @@ -44,6 +42,11 @@ # class User < ApplicationRecord + self.ignored_columns = %w( + remember_created_at + remember_token + ) + include Settings::Extend include UserRoles @@ -329,10 +332,9 @@ class User < ApplicationRecord end def reset_password! - # First, change password to something random, invalidate the remember-me token, - # and deactivate all sessions + # First, change password to something random and deactivate all sessions transaction do - update(remember_token: nil, remember_created_at: nil, password: SecureRandom.hex) + update(password: SecureRandom.hex) session_activations.destroy_all end |