Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Better handling of Doorkeeper exceptions

Damian Legawiecb6eafb650faf
diff --git a/api/app/controllers/spree/api/v2/base_controller.rb b/api/app/controllers/spree/api/v2/base_controller.rb
index 8fea933c10..c8d1a68662 100644
--- a/api/app/controllers/spree/api/v2/base_controller.rb
+++ b/api/app/controllers/spree/api/v2/base_controller.rb
@@ -7,8 +7,10 @@ module Spree
include Spree::Core::ControllerHelpers::Store
include Spree::Core::ControllerHelpers::Locale
include Spree::Core::ControllerHelpers::Currency
+
rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
rescue_from CanCan::AccessDenied, with: :access_denied
+ rescue_from Doorkeeper::Errors::DoorkeeperError, with: :access_denied_401
rescue_from Spree::Core::GatewayError, with: :gateway_error
rescue_from ActionController::ParameterMissing, with: :error_during_processing
if defined?(JSONAPI::Serializer::UnsupportedIncludeError)
@@ -129,6 +131,10 @@ module Spree
render_error_payload(exception.message, 403)
end
+ def access_denied_401(exception)
+ render_error_payload(exception.message, 401)
+ end
+
def gateway_error(exception)
render_error_payload(exception.message)
end
diff --git a/api/config/initializers/doorkeeper.rb b/api/config/initializers/doorkeeper.rb
index 208622b0ad..2b1f6b49ca 100644
--- a/api/config/initializers/doorkeeper.rb
+++ b/api/config/initializers/doorkeeper.rb
@@ -26,6 +26,8 @@ Doorkeeper.configure do
grant_flows %w(password)
+ handle_auth_errors :raise
+
access_token_methods :from_bearer_authorization, :from_access_token_param
end