bug: Work around response_body issue on Rails 5, fix specs

doorkeeper-gem · Nov 7, 2016 · bc4ac76 · bc4ac76
1 parent 490f756
commit bc4ac76
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/doorkeeper/openid_connect/helpers/controller.rb b/lib/doorkeeper/openid_connect/helpers/controller.rb
@@ -16,10 +16,11 @@ def validate_prompt_param!(owner)
           return true unless prompt_values.include?('none') && !owner
 
           # clear the previous response body to avoid a DoubleRenderError
-          # TODO: this is currently broken on Rails 5, see
-          # https://github.com/rails/rails/issues/25106
           self.response_body = nil
 
+          # FIXME: workaround for Rails 5, see https://github.com/rails/rails/issues/25106
+          @_response_body = nil
+
           error = ::Doorkeeper::OAuth::ErrorResponse.new(name: :login_required)
           response.headers.merge!(error.headers)
           render json: error.body, status: error.status

diff --git a/...s/doorkeeper/authorizations_controller.rb → ...rkeeper/authorizations_controller_spec.rb b/...s/doorkeeper/authorizations_controller.rb → ...rkeeper/authorizations_controller_spec.rb
diff --git a/spec/dummy/config/initializers/doorkeeper.rb b/spec/dummy/config/initializers/doorkeeper.rb
@@ -1,7 +1,7 @@
 Doorkeeper.configure do
   resource_owner_authenticator do
     if params[:current_user]
-      User.new name: params[:current_user]
+      User.find(params[:current_user])
     else
       redirect_to('/login')
       nil