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.

Fix `store#url` on development env when using `https` (#12350)

Damian Kaczmarczykaace8e47624d
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index c5ffa27c6a..88ddf1cc43 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -260,11 +260,18 @@ module Spree
def formatted_url
@formatted_url ||= if Rails.env.development? || Rails.env.test?
- URI::HTTP.build(
- scheme: Rails.application.routes.default_url_options[:protocol] || 'http',
- host: url.to_s.sub(%r{^https?://}, ''),
- port: Rails.application.routes.default_url_options[:port]
- ).to_s
+ scheme = Rails.application.routes.default_url_options[:protocol] || :http
+ if scheme.to_sym == :https
+ URI::HTTPS.build(
+ host: url.to_s.sub(%r{^https?://}, ''),
+ port: Rails.application.routes.default_url_options[:port]
+ ).to_s
+ else
+ URI::HTTP.build(
+ host: url.to_s.sub(%r{^https?://}, ''),
+ port: Rails.application.routes.default_url_options[:port]
+ ).to_s
+ end
else
URI::HTTPS.build(
host: url.to_s.sub(%r{^https?://}, '')