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 locking with unsaved changes bug #1340

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix locking with unsaved changes bug #1340

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8dc860
Fix locking with unsaved changes bug
Sep 9, 2019
334813b
Remove do
Sep 12, 2019
b458903
Refactor
Sep 12, 2019
8d84175
WIP
Oct 29, 2019
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
7 changes: 7 additions & 0 deletions app/controllers/devise_token_auth/concerns/set_user_by_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ def update_auth_header
private

def refresh_headers
# At this point restore the attributes so we can obtain the lock
# otherwise an exception is thrown while trying to obtain the lock
# with unsaved data on the resource.
unless const_defined?('Mongoid') do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove do

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@resource.restore_attributes
end

# Lock the user record during any auth_header updates to ensure
# we don't have write contention from multiple threads
@resource.with_lock do
Expand Down