lib/doorkeeper/oauth/authorization/token.rb in doorkeeper-5.6.0 vs lib/doorkeeper/oauth/authorization/token.rb in doorkeeper-5.6.1

@@ -57,11 +57,12 @@
             Doorkeeper::OAuth::IMPLICIT,
             pre_auth.scopes,
             resource_owner,
           )
 
+          application = pre_auth.client.is_a?(Doorkeeper::Application) ? pre_auth.client : pre_auth.client.application if pre_auth.client
           @token = Doorkeeper.config.access_token_model.find_or_create_for(
-            application: pre_auth.client,
+            application: application,
             resource_owner: resource_owner,
             scopes: pre_auth.scopes,
             expires_in: self.class.access_token_expires_in(Doorkeeper.config, context),
             use_refresh_token: false,
           )