Rewrite host domain for Shopify storefront URIs in development

Author: Shinomix

lib/shopify_app/utils.rb

@@ -21,7 +21,11 @@ def sanitize_shop_domain(shop_domain)
 
           return myshopify_domain_from_unified_admin(uri) if unified_admin?(uri) && from_trusted_domain
           return nil if no_shop_name_in_subdomain || uri.host&.empty?
-          return uri.host if from_trusted_domain
+
+          next unless from_trusted_domain
+          return dev_api_domain(uri.host) if storefront_domain?(uri)
+
+          return uri.host
         end
         nil
       end
@@ -65,6 +69,14 @@ def trusted_domains
         trusted_domains
       end
 
+      def storefront_domain?(uri)
+        uri.host.include?(".my.shop.dev")
+      end
+
+      def dev_api_domain(host)
+        host.gsub(".my.shop.dev", ".dev-api.shop.dev")
+      end
+
       def uri_from_shop_domain(shop_domain)
         name = shop_domain.to_s.downcase.strip
         name += ".#{myshopify_domain}" if !name.include?(myshopify_domain.to_s) && !name.include?(".")

test/shopify_app/utils_test.rb

@@ -34,6 +34,16 @@ class UtilsTest < ActiveSupport::TestCase
     end
   end
 
+  [
+    "https://my-shop.my.shop.dev",
+    "http://my-shop.my.shop.dev",
+    "my-shop.my.shop.dev",
+  ].each do |good_url|
+    test "sanitize_shop_domain replaces development storefront domain for (#{good_url}) with internal domain" do
+      assert_equal "my-shop.dev-api.shop.dev", ShopifyApp::Utils.sanitize_shop_domain(good_url)
+    end
+  end
+
   test "sanitize_shop_domain URL shopify spin.dev custom myshopify_domain" do
     myshop_domain = "http://shopify.foobar-part-onboard-0d6x.asdf-rygus.us.spin.dev"
     ShopifyApp.configuration.stubs(:myshopify_domain).returns(myshop_domain)