Skip to content

Do not set unlock_token attribute to undigested value after unlocking user with token #5779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

Do not set unlock_token attribute to undigested value after unlocking user with token #5779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/devise/models/lockable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,10 @@ def send_unlock_instructions(attributes = {})
# If the user is not locked, creates an error for the user
# Options must have the unlock_token
def unlock_access_by_token(unlock_token)
original_token = unlock_token
unlock_token = Devise.token_generator.digest(self, :unlock_token, unlock_token)
unlock_token = Devise.token_generator.digest(self, :unlock_token, unlock_token)

lockable = find_or_initialize_with_error_by(:unlock_token, unlock_token)
lockable.unlock_access! if lockable.persisted?
lockable.unlock_token = original_token
lockable
end

Expand Down
2 changes: 2 additions & 0 deletions test/models/lockable_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,9 @@ def setup
raw = user.send_unlock_instructions
locked_user = User.unlock_access_by_token(raw)
assert_equal user, locked_user
assert_not locked_user.changed?
assert_not user.reload.access_locked?
assert_nil user.reload.unlock_token
end

test 'should return a new record with errors when a invalid token is given' do
Expand Down