From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 28 Jun 2017 15:43:48 +0000 (+0200)
Subject: Do not fail to create access token if superapp was never created (#3986)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=71bc75e6ac00050ff98609b3cbeb38a0db157e1f;p=mastodon.git

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

diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 02a918e8a..887e3e3bd 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -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,