Skip to content
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

Jump to bottom

Fix overwriting the remember_token when a valid one already exists #4101

Merged
merged 1 commit into from May 15, 2016
Merged

Fix overwriting the remember_token when a valid one already exists #4101

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/devise/models/rememberable.rb
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ def self.required_fields(klass)
end

def remember_me!
self.remember_token = self.class.remember_token if respond_to?(:remember_token)
self.remember_token ||= self.class.remember_token if respond_to?(:remember_token)
self.remember_created_at ||= Time.now.utc
save(validate: false) if self.changed?
end
Expand Down
12 changes: 12 additions & 0 deletions test/models/rememberable_test.rb
View file
Open in desktop
Expand Up @@ -16,6 +16,18 @@ def create_resource
assert user.remember_created_at
end

test 'remember_me should not generate a new token if valid token exists' do
user = create_user
user.singleton_class.send(:attr_accessor, :remember_token)
User.to_adapter.expects(:find_first).returns(nil)

user.remember_me!
existing_token = user.remember_token

user.remember_me!
assert_equal existing_token, user.remember_token
end

test 'forget_me should not clear remember token if using salt' do
user = create_user
user.remember_me!
Expand Down