scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5045 from rekonder/aj_SCI_7972

Browse source 
Fix connected device model for request without device id [SCI-7972]
This commit is contained in:
artoscinote 2023-03-01 09:51:54 +01:00 committed by GitHub
parent e58fb71adf 64da4c5368
commit 995548423e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/connected_device.rb
View file

@ -2,6 +2,7 @@
class ConnectedDevice < ApplicationRecord
belongs_to :oauth_access_token, class_name: 'Doorkeeper::AccessToken'
validates :uid, presence: true
after_destroy :revoke_token
@ -10,8 +11,10 @@ class ConnectedDevice < ApplicationRecord
end
def self.from_request_headers(headers, token = nil)
return unless headers['Device-Id']
current_token = Doorkeeper::AccessToken.find_by(
token: headers['Authorization'].gsub(/Bearer\s/, '')
token: headers['Authorization']&.gsub(/Bearer\s/, '')
)
return unless token || current_token