mirror of
https://github.com/discourse/discourse.git
synced 2024-11-29 04:03:57 -06:00
82383ea776
This commit updates the `UserPasswordExpirer.expire_user_password` method to update `UserPassword#password_expired_at` when an existing `UserPassword` record exists with the same `password_salt`, `password_hash` and `password_algorithm`. This is to prevent the unique validation error on `UserPassword#user_id` and `UserPassword#password_hash` from being raised when the method is called twice for a user that has not changed its password.
47 lines
1.6 KiB
Ruby
47 lines
1.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe UserPasswordExpirer do
|
|
fab!(:password) { "somerandompassword" }
|
|
fab!(:user) { Fabricate(:user, password:) }
|
|
|
|
describe ".expire_user_password" do
|
|
it "should create a new UserPassword record with the user's current password information" do
|
|
freeze_time
|
|
|
|
described_class.expire_user_password(user)
|
|
|
|
expect(user.passwords.count).to eq(1)
|
|
|
|
user_password = user.passwords.first
|
|
|
|
expect(user_password.password_hash).to eq(user.password_hash)
|
|
expect(user_password.password_salt).to eq(user.salt)
|
|
expect(user_password.password_algorithm).to eq(user.password_algorithm)
|
|
expect(user_password.password_expired_at).to eq_time(Time.zone.now)
|
|
end
|
|
|
|
it "should update `UserPassword#password_expired_at` if the user already has an existing UserPassword record with the same password hash, salt and algorithm" do
|
|
freeze_time(1.hour.ago) do
|
|
described_class.expire_user_password(user)
|
|
|
|
user_password = user.passwords.first
|
|
|
|
expect(user_password.password_expired_at).to eq_time(Time.zone.now)
|
|
end
|
|
|
|
freeze_time do
|
|
described_class.expire_user_password(user)
|
|
|
|
expect(user.passwords.count).to eq(1)
|
|
|
|
user_password = user.passwords.first
|
|
|
|
expect(user_password.password_hash).to eq(user.password_hash)
|
|
expect(user_password.password_salt).to eq(user.salt)
|
|
expect(user_password.password_algorithm).to eq(user.password_algorithm)
|
|
expect(user_password.password_expired_at).to eq_time(Time.zone.now)
|
|
end
|
|
end
|
|
end
|
|
end
|