lib/doorkeeper/oauth/request_concern.rb in doorkeeper-2.1.0 vs lib/doorkeeper/oauth/request_concern.rb in doorkeeper-2.1.1

@@ -32,10 +32,10 @@
       def find_or_create_access_token(client, resource_owner_id, scopes, server)
         @access_token = AccessToken.find_or_create_for(
           client,
           resource_owner_id,
           scopes,
-          server.access_token_expires_in,
+          Authorization::Token.access_token_expires_in(server, client),
           server.refresh_token_enabled?)
       end
 
       def before_successful_response
       end