scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 19:51:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2920 from biosistemika/revert-2919-ok_SCI_5123

Browse source 
Revert "Init user session for devise controllers after token auth [SCI-5123]"
This commit is contained in:
Alex Kriuchykhin 2020-10-27 13:22:17 +01:00 committed by GitHub
commit 98e6cdcaa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/concerns/token_authentication.rb
View file

@ -22,10 +22,7 @@ module TokenAuthentication
Extends::API_PLUGABLE_AUTH_METHODS.each do |auth_method|
method(auth_method).call
if current_user
sign_in(current_user) if devise_controller?
return true
end
return true if current_user
end
# Default token implementation
@ -36,7 +33,5 @@ module TokenAuthentication
payload = Api::CoreJwt.decode(@token)
@current_user = User.find_by(id: payload['sub'])
raise JWT::InvalidPayload, I18n.t('api.core.no_user_mapping') unless current_user
sign_in(current_user) if devise_controller?
end
end