Fix bug, ensure that current_oauth_token method return not expirable …

…token (#11147)

* Fix bug, ensure that current_oauth_token method return not expirable token

* Fix line too long on current_oauth_token method

* Fix issues generated by codeclimate revision

Co-authored-by: Pau Sentis <pau.sf@coditramuntana.com>

core/lib/spree/core/controller_helpers/auth.rb

@@ -34,10 +34,12 @@ def set_token
         end
 
         def current_oauth_token
+          get_last_access_token = ->(user) { Doorkeeper::AccessToken.active_for(user).where(expires_in: nil).last }
+          create_access_token = ->(user) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id) }
           user = try_spree_current_user
           return unless user
 
-          @current_oauth_token ||= Doorkeeper::AccessToken.active_for(user).last || Doorkeeper::AccessToken.create!(resource_owner_id: user.id)
+          @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)
         end
 
         def store_location