shopify-cli 2.15.5 → 2.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc8ad7231574d322ab00d0f5223bbd270689a8251e4574329fc58ae001ddd76
-  data.tar.gz: 98ea2d3cb974a4cc33593bde1af7052807c1dcb31cb26246a3d65eec0a7fb074
+  metadata.gz: 756d40b258dafcaa9e3fd02305cbc3eb4bc1416b5711f22543c9b6221c4bd888
+  data.tar.gz: 476eea5325f671f2e3a1337700356f895792c1e4b2568dc56e38c58b4d1e93d5
 SHA512:
-  metadata.gz: 33d4f4d824d79a8f5c2d6238e481985f4f9539b44c0a2d5666f55675fc320a0c30b0d1f058a3016a496a193151a296dd0351ea6d682aefba5394af90f5fb8ad9
-  data.tar.gz: a382ec37c557103b3d8ec5b939d90e9184355e184fdeaeee665c86d987c25fb695b8e7044c71f62f73620a4745119c7da84f3ad23c2bc1488dea78bed58b74f0
+  metadata.gz: 11bee20d53a3809978a2cf37a7f4ed3e759f0edd7d53ac8ec9e08dad76c1bd3ed8fcbf66262dc686d7bf929fec256685189facaf1255c2f51c2f566757b7ae29
+  data.tar.gz: 8cb0d2cb3d2edf801f752b74ed8534816180e257d3a1afef8fb0b13ffa5a3a85388bd6bb71df04d0c42bf450cedd1008e473f36cf48722435eea912645dcb1e9

data/CHANGELOG.md

@@ -2,6 +2,11 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.15.6 - 2022-04-12
+
+### Fixed
+* [#2246](https://github.com/Shopify/shopify-cli/pull/2246): Fix callback urls for app serve
+
 ## Version 2.15.5 - 2022-04-08
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.15.5)
+    shopify-cli (2.15.6)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)

data/lib/shopify_cli/services/app/serve/serve_service.rb

@@ -36,7 +36,7 @@ module ShopifyCLI
             ShopifyCLI::Tasks::UpdateDashboardURLS.call(
               context,
               url: project.env.host,
-              callback_url: "/auth/shopify/callback",
+              callback_urls: %w(/auth/shopify/callback /auth/callback),
             )
           end
 

data/lib/shopify_cli/tasks/update_dashboard_urls.rb

@@ -1,18 +1,21 @@
+require "set"
+
 module ShopifyCLI
   module Tasks
     class UpdateDashboardURLS < ShopifyCLI::Task
       NGROK_REGEX = /https:\/\/([a-z0-9\-]+\.ngrok\.io)(.*)/
 
-      def call(ctx, url:, callback_url:)
+      def call(ctx, url:, callback_urls:)
         @ctx = ctx
         project = ShopifyCLI::Project.current
         api_key = project.env.api_key
         result = ShopifyCLI::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
         app = result["data"]["app"]
 
-        return if app["applicationUrl"].match(url)
+        constructed_urls = construct_redirect_urls(app["redirectUrlWhitelist"], url, callback_urls)
+
+        return if already_updated(app, constructed_urls, url)
 
-        constructed_urls = construct_redirect_urls(app["redirectUrlWhitelist"], url, callback_url)
         ShopifyCLI::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
           applicationUrl: url,
           redirectUrlWhitelist: constructed_urls,
@@ -25,7 +28,7 @@ module ShopifyCLI
         raise
       end
 
-      def construct_redirect_urls(urls, new_url, callback_url)
+      def construct_redirect_urls(urls, new_url, callback_urls)
         new_urls = urls.map do |url|
           if (match = url.match(NGROK_REGEX))
             "#{new_url}#{match[2]}"
@@ -33,11 +36,22 @@ module ShopifyCLI
             url
           end
         end
-        if new_urls.grep(/#{new_url}#{callback_url}/).empty?
-          new_urls.push("#{new_url}#{callback_url}")
+        callback_urls.each do |callback_url|
+          if new_urls.grep(/#{new_url}#{callback_url}/).empty?
+            new_urls.push("#{new_url}#{callback_url}")
+          end
         end
         new_urls.uniq
       end
+
+      private
+
+      def already_updated(app, new_redirect_urls, new_url)
+        current_url = app["applicationUrl"]
+        current_redirect_urls = app["redirectUrlWhitelist"]
+        current_url.match(new_url) &&
+          Set.new(current_redirect_urls) == Set.new(new_redirect_urls)
+      end
     end
   end
 end

data/lib/shopify_cli/theme/dev_server/local_assets.rb

@@ -44,7 +44,7 @@ module ShopifyCLI
 
         def serve_file(path_info)
           path = @theme.root.join(path_info[1..-1])
-          if path.file? && path.readable?
+          if path.file? && path.readable? && @theme.theme_file?(path)
             [
               200,
               {

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.15.5"
+  VERSION = "2.15.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.15.5
+  version: 2.15.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler