Second pass, because wow my code was rough

Author: ThisIsMissEm

lib/doorkeeper.rb

@@ -7,6 +7,7 @@
 #
 module Doorkeeper
   autoload :Errors, "doorkeeper/errors"
+  autoload :ClientAuthentication, "doorkeeper/client_authentication"
   autoload :GrantFlow, "doorkeeper/grant_flow"
   autoload :OAuth, "doorkeeper/oauth"
   autoload :Rake, "doorkeeper/rake"
@@ -33,7 +34,6 @@ module Request
     autoload :RefreshToken, "doorkeeper/request/refresh_token"
     autoload :Token, "doorkeeper/request/token"
   end
-
   module RevocableTokens
     autoload :RevocableAccessToken, "doorkeeper/revocable_tokens/revocable_access_token"
     autoload :RevocableRefreshToken, "doorkeeper/revocable_tokens/revocable_refresh_token"
@@ -62,16 +62,22 @@ module OAuth
     autoload :TokenRequest, "doorkeeper/oauth/token_request"
     autoload :TokenResponse, "doorkeeper/oauth/token_response"
 
+    module ClientAuthentication
+      autoload :None, "doorkeeper/oauth/client_authentication/none"
+      autoload :ClientSecretBasic, "doorkeeper/oauth/client_authentication/client_secret_basic"
+      autoload :ClientSecretPost, "doorkeeper/oauth/client_authentication/client_secret_post"
+    end
+
     module Authorization
       autoload :Code, "doorkeeper/oauth/authorization/code"
       autoload :Context, "doorkeeper/oauth/authorization/context"
       autoload :Token, "doorkeeper/oauth/authorization/token"
       autoload :URIBuilder, "doorkeeper/oauth/authorization/uri_builder"
     end
 
-    class Client
-      autoload :Credentials, "doorkeeper/oauth/client/credentials"
-    end
+    # class Client
+    #   autoload :Credentials, "doorkeeper/oauth/client/credentials"
+    # end
 
     module ClientCredentials
       autoload :Validator, "doorkeeper/oauth/client_credentials/validator"

lib/doorkeeper/client_authentication.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require "doorkeeper/client_authentication/flow"
+require "doorkeeper/client_authentication/credentials"
+require "doorkeeper/client_authentication/fallback_mechanism"
+require "doorkeeper/client_authentication/mechanism"
 require "doorkeeper/client_authentication/registry"
 
 module Doorkeeper
@@ -9,18 +11,18 @@ module ClientAuthentication
 
     register(
       :none,
-      mechanism: Doorkeeper::ClientAuthentication::Mechanisms::None,
+      mechanism: Doorkeeper::OAuth::ClientAuthentication::None,
       authenticates_client: false
     )
 
     register(
       :client_secret_post,
-      mechanism: Doorkeeper::ClientAuthentication::Mechanisms::ClientSecretPost,
+      mechanism: Doorkeeper::OAuth::ClientAuthentication::ClientSecretPost,
     )
 
     register(
       :client_secret_basic,
-      mechanism: Doorkeeper::ClientAuthentication::Mechanisms::ClientSecretBasic,
+      mechanism: Doorkeeper::OAuth::ClientAuthentication::ClientSecretBasic,
     )
   end
 end

lib/doorkeeper/client_authentication/fallback_mechanism.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  module ClientAuthentication
+    class FallbackMechanism
+      def authenticate(request)
+        Doorkeeper::ClientAuthentication::Credentials.new(nil, nil)
+      end
+    end
+  end
+end

lib/doorkeeper/client_authentication/mechanism.rb

@@ -14,6 +14,10 @@ def initialize(name, **options)
       def authenticates_client?
         !!@authenticates_client
       end
+
+      def matches_request?(request)
+        @mechanism.matches_request?(request)
+      end
     end
   end
 end

lib/doorkeeper/client_authentication/registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Doorkeeper
-  module GrantFlow
+  module ClientAuthentication
     module Registry
       mattr_accessor :mechanisms
       self.mechanisms = {}

lib/doorkeeper/oauth/client/credentials.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Doorkeeper
-  module ClientAuthentication
-    module Mechanisms
+  module OAuth
+    module ClientAuthentication
       class ClientSecretBasic
         def self.matches_request?(request)
           request.authorization.present? && request.authorization.downcase.start_with?('basic')

…cation/mechanisms/client_secret_basic.rb …nt_authentication/client_secret_basic.rblib/doorkeeper/client_authentication/mechanisms/client_secret_basic.rb renamed to lib/doorkeeper/oauth/client_authentication/client_secret_basic.rb lib/doorkeeper/client_authentication/mechanisms/client_secret_basic.rb renamed to lib/doorkeeper/oauth/client_authentication/client_secret_basic.rb

@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
 module Doorkeeper
-  module ClientAuthentication
-    module Mechanisms
+  module OAuth
+    module ClientAuthentication
       class ClientSecretPost
         def self.matches_request?(request)
-          request.method.upcase === "POST"
+          request.method.upcase === "POST" && request.request_parameters[:client_id].present? && request.request_parameters[:client_secret].present?
         end
 
         def authenticate(request)
           client_id = request.request_parameters[:client_id]
           client_secret = request.request_parameters[:client_secret]
 
-          return unless client_id.present? && client_secret.present?
-
           Doorkeeper::ClientAuthentication::Credentials.new(
             client_id,
             client_secret

…ication/mechanisms/client_secret_post.rb …ent_authentication/client_secret_post.rblib/doorkeeper/client_authentication/mechanisms/client_secret_post.rb renamed to lib/doorkeeper/oauth/client_authentication/client_secret_post.rb lib/doorkeeper/client_authentication/mechanisms/client_secret_post.rb renamed to lib/doorkeeper/oauth/client_authentication/client_secret_post.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Doorkeeper
-  module ClientAuthentication
-    module Mechanisms
+  module OAuth
+    module ClientAuthentication
       class None
         def self.matches_request?(request)
           !request.authorization && request.request_parameters[:client_id] && !request.request_parameters[:client_secret]

…client_authentication/mechanisms/none.rb …eper/oauth/client_authentication/none.rblib/doorkeeper/client_authentication/mechanisms/none.rb renamed to lib/doorkeeper/oauth/client_authentication/none.rb lib/doorkeeper/client_authentication/mechanisms/none.rb renamed to lib/doorkeeper/oauth/client_authentication/none.rb

@@ -4,12 +4,14 @@ module Doorkeeper
   module Request
     class << self
       def client_authentication_mechanism(request)
-        client_authentication_mechanisms = client_authentication_mechanisms.detect do |mechanism|
-          mechanism.matches_request?(request)
+        strategy = client_authentication_strategies.detect do |strategy|
+          strategy.matches_request?(request)
         end
 
-        if client_authentication_mechanisms
-          client_authentication_mechanisms.mechanism
+        if strategy
+          strategy.mechanism
+        else
+          Doorkeeper::ClientAuthentication::FallbackMechanism
         end
       end
 
@@ -50,7 +52,7 @@ def token_strategy(grant_type)
 
       private
 
-      def client_authentication_mechanisms
+      def client_authentication_strategies
         Doorkeeper.configuration.client_authentication_mechanisms
       end