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.

[SD-1438] Remove API -> API v1 redirect (#11306)

Piotr Milewskic6c3d9fc2df1
diff --git a/api/config/routes.rb b/api/config/routes.rb
index a4aef09099..de08b1aa21 100644
--- a/api/config/routes.rb
+++ b/api/config/routes.rb
@@ -281,27 +281,6 @@ Spree::Core::Engine.add_routes do
end
get '/404', to: 'errors#render_404'
-
- match 'v:api/*path', to: redirect { |params, request|
- format = ".#{params[:format]}" unless params[:format].blank?
- query = "?#{request.query_string}" unless request.query_string.blank?
-
- if request.path == "#{spree_path}api/v1/#{params[:path]}#{format}#{query}"
- "#{spree_path}api/404"
- else
- "#{spree_path}api/v1/#{params[:path]}#{format}#{query}"
- end
- }, via: [:get, :post, :put, :patch, :delete]
-
- match '*path', to: redirect { |params, request|
- format = ".#{params[:format]}" unless params[:format].blank?
- query = "?#{request.query_string}" unless request.query_string.blank?
-
- if request.path == "#{spree_path}api/v1/#{params[:path]}#{format}#{query}"
- "#{spree_path}api/404"
- else
- "#{spree_path}api/v1/#{params[:path]}#{format}#{query}"
- end
- }, via: [:get, :post, :put, :patch, :delete]
+ match '*path', to: 'errors#render_404', via: [:get, :post, :put, :patch, :delete]
end
end
diff --git a/api/spec/requests/spree/api/errors_spec.rb b/api/spec/requests/spree/api/errors_spec.rb
index b1894855c0..5d5300de3b 100644
--- a/api/spec/requests/spree/api/errors_spec.rb
+++ b/api/spec/requests/spree/api/errors_spec.rb
@@ -5,13 +5,7 @@ describe 'API Errors Spec', type: :request do
it 'returns 404' do
get '/api/prods'
- expect(response).to redirect_to('/api/v1/prods.json')
- follow_redirect!
-
- expect(response).to redirect_to('/api/404')
- follow_redirect!
-
- expect(response.status).to eq 404
+ expect(response).to have_http_status 404
end
end
end
diff --git a/api/spec/requests/version_spec.rb b/api/spec/requests/version_spec.rb
index 53baa44513..3e28417e60 100644
--- a/api/spec/requests/version_spec.rb
+++ b/api/spec/requests/version_spec.rb
@@ -4,9 +4,9 @@ describe 'Version', type: :request do
before { create_list(:country, 2) }
describe '/api' do
- it 'be a redirect' do
+ it 'returns 404' do
get '/api/countries'
- expect(response).to have_http_status 301
+ expect(response).to have_http_status 404
end
end