kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Merge pull request #3318 from BrentWheeldon/bugfix/clear-reset-token

Browse source 
Only set token back if password reset fails.
This commit is contained in:
José Valim 2014-12-02 11:12:12 +01:00
commit a9d90503e9
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/devise/models/recoverable.rb
View file

@ -146,7 +146,7 @@ module Devise
end end
end end
recoverable.reset_password_token = original_token recoverable.reset_password_token = original_token if recoverable.reset_password_token.present?
recoverable recoverable
end end

7
test/models/recoverable_test.rb
View file

@ -135,6 +135,7 @@ class RecoverableTest < ActiveSupport::TestCase
reset_password_user = User.reset_password_by_token(reset_password_token: raw, password: '') reset_password_user = User.reset_password_by_token(reset_password_token: raw, password: '')
assert_not reset_password_user.errors.empty? assert_not reset_password_user.errors.empty?
assert_match "can't be blank", reset_password_user.errors[:password].join assert_match "can't be blank", reset_password_user.errors[:password].join
assert_equal raw, reset_password_user.reset_password_token
end end
test 'should reset successfully user password given the new password and confirmation' do test 'should reset successfully user password given the new password and confirmation' do
@ -142,15 +143,17 @@ class RecoverableTest < ActiveSupport::TestCase
old_password = user.password old_password = user.password
raw = user.send_reset_password_instructions raw = user.send_reset_password_instructions
User.reset_password_by_token( reset_password_user = User.reset_password_by_token(
reset_password_token: raw, reset_password_token: raw,
password: 'new_password', password: 'new_password',
password_confirmation: 'new_password' password_confirmation: 'new_password'
) )
user.reload assert_nil reset_password_user.reset_password_token
user.reload
assert_not user.valid_password?(old_password) assert_not user.valid_password?(old_password)
assert user.valid_password?('new_password') assert user.valid_password?('new_password')
assert_nil user.reset_password_token
end end
test 'should not reset password after reset_password_within time' do test 'should not reset password after reset_password_within time' do