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.

Doorkeeper controllers now inherit from `Api::V2::BaseController` (#11538)

Damian Legawiec01e045bc9fa1
diff --git a/api/config/initializers/doorkeeper.rb b/api/config/initializers/doorkeeper.rb
index 1bce2f35bc..c5ef568ca7 100644
--- a/api/config/initializers/doorkeeper.rb
+++ b/api/config/initializers/doorkeeper.rb
@@ -2,7 +2,8 @@ Doorkeeper.configure do
orm :active_record
use_refresh_token
api_only
- base_controller 'ActionController::API'
+ base_controller 'Spree::Api::V2::BaseController'
+ base_metal_controller 'Spree::Api::V2::BaseController'
# FIXME: we should only skip this for Storefront API until v5
# we should not skip this for Platform API
diff --git a/api/spec/controllers/doorkeeper/application_metal_controller_spec.rb b/api/spec/controllers/doorkeeper/application_metal_controller_spec.rb
new file mode 100644
index 0000000000..02bb889ea2
--- /dev/null
+++ b/api/spec/controllers/doorkeeper/application_metal_controller_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Doorkeeper::ApplicationMetalController, type: :controller do
+ it 'inherits from Spree::Api::V2::BaseController' do
+ expect(described_class.superclass).to eq Spree::Api::V2::BaseController
+ end
+end
diff --git a/api/spec/controllers/doorkeeper/tokens_controller_spec.rb b/api/spec/controllers/doorkeeper/tokens_controller_spec.rb
new file mode 100644
index 0000000000..6257ab7389
--- /dev/null
+++ b/api/spec/controllers/doorkeeper/tokens_controller_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Doorkeeper::TokensController, type: :controller do
+ describe '#current_store' do
+ let!(:store) { create :store, default: true }
+
+ it 'returns current store' do
+ expect(controller.current_store).to eq(store)
+ end
+ end
+end