Merge pull request #1072 from patientslikeme/memoize_authorization_re…

…sponse

AuthorizationsController: Memoize strategy.authorize result

NEWS.md

@@ -23,6 +23,8 @@ User-visible changes worth mentioning.
 - [#1064] Add :before_successful_authorization and :after_successful_authorization hooks
 - [#1069] Upgrade Bootstrap to 4 for Admin
 - [#1068] Add rake task to cleanup databases that can become large over time
+- [#1072] AuthorizationsController: Memoize strategy.authorize_response result to enable
+  subclasses to use the response object.
 
 ## 4.3.2
 

app/controllers/doorkeeper/authorizations_controller.rb

@@ -12,7 +12,7 @@ def new
 
     # TODO: Handle raise invalid authorization
     def create
-      redirect_or_render authorization.authorize
+      redirect_or_render authorize_response
     end
 
     def destroy
@@ -24,7 +24,7 @@ def destroy
     def render_success
       before_successful_authorization
       if skip_authorization? || matching_token?
-        auth = authorization.authorize
+        auth = authorize_response
         after_successful_authorization
         redirect_or_render auth
       elsif Doorkeeper.configuration.api_only
@@ -83,6 +83,10 @@ def strategy
       @strategy ||= server.authorization_request pre_auth.response_type
     end
 
+    def authorize_response
+      @authorize_response ||= strategy.authorize
+    end
+
     def after_successful_authorization
       Doorkeeper.configuration.after_successful_authorization.call(self)
     end

spec/controllers/authorizations_controller_spec.rb

@@ -368,4 +368,18 @@ def translated_error_message(key)
       expect(Doorkeeper.configuration).to receive_message_chain(:after_successful_authorization, :call).with(instance_of(described_class))
     end
   end
+
+  describe 'authorize response memoization' do
+    it 'memoizes the result of the authorization' do
+      strategy = double(:strategy, authorize: true)
+      expect(strategy).to receive(:authorize).once
+      allow(controller).to receive(:strategy) { strategy }
+      allow(controller).to receive(:create) do
+        2.times { controller.send :authorize_response }
+        controller.render json: {}, status: :ok
+      end
+
+      post :create
+    end
+  end
 end

spec/controllers/tokens_controller_spec.rb

@@ -74,7 +74,8 @@
       expect(strategy).to receive(:authorize).once
       allow(controller).to receive(:strategy) { strategy }
       allow(controller).to receive(:create) do
-        controller.send :authorize_response
+        2.times { controller.send :authorize_response }
+        controller.render json: {}, status: :ok
       end
 
       post :create