Refactor BaseRequest callbacks into configurable lambdas

lib/doorkeeper/config.rb

@@ -228,7 +228,9 @@ def option(name, options = {})
              warn(I18n.translate('doorkeeper.errors.messages.credential_flow_not_configured'))
              nil
            end)
-
+    option :before_successful_strategy_response, default: ->(_request) {}
+    option :after_successful_strategy_response,
+           default: ->(_request, _response) {}
     option :skip_authorization,             default: ->(_routes) {}
     option :access_token_expires_in,        default: 7200
     option :custom_access_token_expires_in, default: ->(_app) { nil }

lib/doorkeeper/oauth/base_request.rb

@@ -42,9 +42,14 @@ def find_or_create_access_token(client, resource_owner_id, scopes, server)
         )
       end
 
-      def before_successful_response; end
+      def before_successful_response
+        Doorkeeper.configuration.before_successful_strategy_response.call(self)
+      end
 
-      def after_successful_response; end
+      def after_successful_response
+        Doorkeeper.configuration.after_successful_strategy_response.
+          call(self, @response)
+      end
     end
   end
 end

lib/generators/doorkeeper/templates/initializer.rb

@@ -102,6 +102,17 @@
   #
   # grant_flows %w[authorization_code client_credentials]
 
+  # Hook into the strategies' request & response life-cycle in case your
+  # application needs advanced customization or logging:
+  #
+  # before_successful_strategy_response do |request|
+  #   puts "BEFORE HOOK FIRED! #{request}"
+  # end
+  #
+  # after_successful_strategy_response do |request, response|
+  #   puts "AFTER HOOK FIRED! #{request}, #{response}"
+  # end
+
   # Under some circumstances you might want to have applications auto-approved,
   # so that the user skips the authorization step.
   # For example if dealing with a trusted application.

spec/dummy/config/initializers/doorkeeper.rb

@@ -84,6 +84,17 @@
   #
   # grant_flows %w[authorization_code client_credentials]
 
+  # Hook into the strategies' request & response life-cycle in case your
+  # application needs advanced customization or logging:
+  #
+  # before_successful_strategy_response do |request|
+  #   puts "BEFORE HOOK FIRED! #{request}"
+  # end
+  #
+  # after_successful_strategy_response do |request, response|
+  #   puts "AFTER HOOK FIRED! #{request}, #{response}"
+  # end
+
   # Under some circumstances you might want to have applications auto-approved,
   # so that the user skips the authorization step.
   # For example if dealing with a trusted application.

spec/lib/oauth/authorization_code_request_spec.rb

@@ -80,9 +80,9 @@ module Doorkeeper::OAuth
       end.to_not change { Doorkeeper::AccessToken.count }
     end
 
-    it "calls BaseRequest callback methods" do
-      expect_any_instance_of(BaseRequest).to receive(:before_successful_response).once
-      expect_any_instance_of(BaseRequest).to receive(:after_successful_response).once
+    it "calls configured request callback methods" do
+      expect(Doorkeeper.configuration.before_successful_strategy_response).to receive(:call).with(subject).once
+      expect(Doorkeeper.configuration.after_successful_strategy_response).to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
       subject.authorize
     end
 

spec/lib/oauth/password_access_token_request_spec.rb

@@ -67,9 +67,9 @@ module Doorkeeper::OAuth
       end.to_not change { Doorkeeper::AccessToken.count }
     end
 
-    it "calls BaseRequest callback methods" do
-      expect_any_instance_of(BaseRequest).to receive(:before_successful_response).once
-      expect_any_instance_of(BaseRequest).to receive(:after_successful_response).once
+    it "calls configured request callback methods" do
+      expect(Doorkeeper.configuration.before_successful_strategy_response).to receive(:call).with(subject).once
+      expect(Doorkeeper.configuration.after_successful_strategy_response).to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
       subject.authorize
     end
 

spec/lib/oauth/refresh_token_request_spec.rb

@@ -44,9 +44,9 @@ module Doorkeeper::OAuth
       expect { subject.authorize }.to change { refresh_token.revoked? }.from(false).to(true)
     end
 
-    it "calls BaseRequest callback methods" do
-      expect_any_instance_of(BaseRequest).to receive(:before_successful_response).once
-      expect_any_instance_of(BaseRequest).to receive(:after_successful_response).once
+    it "calls configured request callback methods" do
+      expect(Doorkeeper.configuration.before_successful_strategy_response).to receive(:call).with(subject).once
+      expect(Doorkeeper.configuration.after_successful_strategy_response).to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
       subject.authorize
     end