]> cat aescling's git repositories - mastodon.git/commitdiff
Do not fail to create access token if superapp was never created (#3986)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 28 Jun 2017 15:43:48 +0000 (17:43 +0200)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2017 15:43:48 +0000 (17:43 +0200)
app/models/session_activation.rb

index 02a918e8ac5058b07a4fb7ce1ea366722a4d9913..887e3e3bd4f5a1f4481e593dc44941782c642fb0 100644 (file)
@@ -69,9 +69,7 @@ class SessionActivation < ApplicationRecord
   def assign_access_token
     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,
                                                         scopes: 'read write follow',
                                                         expires_in: Doorkeeper.configuration.access_token_expires_in,