ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not fail to create access token if superapp was never created (#3986)

rebase/4.0.0rc2
Eugen Rochko 2017-06-28 17:43:48 +02:00 committed by GitHub
parent e4fee6c138
commit 71bc75e6ac
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/session_activation.rb
View File

@ -69,9 +69,7 @@ class SessionActivation < ApplicationRecord
def assign_access_token def assign_access_token
superapp = Doorkeeper::Application.find_by(superapp: true) superapp = Doorkeeper::Application.find_by(superapp: true)
return if superapp.nil? self.access_token = Doorkeeper::AccessToken.create!(application_id: superapp&.id,
self.access_token = Doorkeeper::AccessToken.create!(application_id: superapp.id,
resource_owner_id: user_id, resource_owner_id: user_id,
scopes: 'read write follow', scopes: 'read write follow',
expires_in: Doorkeeper.configuration.access_token_expires_in, expires_in: Doorkeeper.configuration.access_token_expires_in,