oauth2.rb in wine_bouncer-0.4.0

- old
+ new

@@ -1,8 +1,9 @@
 module WineBouncer
   class OAuth2 < Grape::Middleware::Base
 
+    include Doorkeeper::Helpers::Controller
     ###
     # returns the api context
     ###
     def context
       env['api.endpoint']
@@ -20,22 +21,15 @@
     end
 
     ###
     # Returns the request context.
     ###
-    def doorkeeper_request
+    def request
       @_doorkeeper_request
     end
 
     ###
-    # Authenticates from a request and returns a valid or invalid token.
-    ###
-    def doorkeeper_token
-      @_doorkeeper_token ||= Doorkeeper.authenticate(doorkeeper_request,Doorkeeper.configuration.access_token_methods)
-    end
-
-    ###
     # Returns true if the doorkeeper token is valid, false otherwise.
     ###
     def valid_doorkeeper_token?(*scopes)
       doorkeeper_token && doorkeeper_token.acceptable?(scopes)
     end
@@ -84,9 +78,11 @@
 
     ###
     # Before do.
     ###
     def before
+      return if WineBouncer.configuration.disable_block.call
+
       set_auth_strategy(WineBouncer.configuration.auth_strategy)
       auth_strategy.api_context = context
       #extend the context with auth methods.
       context.extend(WineBouncer::AuthMethods)
       context.protected_endpoint = endpoint_protected?