lib/doorkeeper/oauth/token.rb in doorkeeper-4.2.0 vs lib/doorkeeper/oauth/token.rb in doorkeeper-4.2.5

@@ -1,9 +1,25 @@
 module Doorkeeper
   module OAuth
     class Token
-      module Methods
+      class << self
+        def from_request(request, *methods)
+          methods.inject(nil) do |credentials, method|
+            method = self.method(method) if method.is_a?(Symbol)
+            credentials = method.call(request)
+            break credentials unless credentials.blank?
+          end
+        end
+
+        def authenticate(request, *methods)
+          if token = from_request(request, *methods)
+            access_token = AccessToken.by_token(token)
+            access_token.revoke_previous_refresh_token! if access_token
+            access_token
+          end
+        end
+
         def from_access_token_param(request)
           request.parameters[:access_token]
         end
 
         def from_bearer_param(request)
@@ -37,27 +53,9 @@
           header.gsub pattern, ''
         end
 
         def match?(header, pattern)
           header && header.match(pattern)
-        end
-      end
-
-      extend Methods
-
-      def self.from_request(request, *methods)
-        methods.inject(nil) do |credentials, method|
-          method = self.method(method) if method.is_a?(Symbol)
-          credentials = method.call(request)
-          break credentials unless credentials.blank?
-        end
-      end
-
-      def self.authenticate(request, *methods)
-        if token = from_request(request, *methods)
-          access_token = AccessToken.by_token(token)
-          access_token.revoke_previous_refresh_token! if access_token
-          access_token
         end
       end
     end
   end
 end