shopify_app 22.3.0 → 22.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bfbed5702afb3db0446577b3846c68c54b51e3453dd1569f0ad0eb727554c8
-  data.tar.gz: 1171f8c433863622ca5c73742c258e02cc59fba3840edcdef1c4002223171bd4
+  metadata.gz: 2b4b936b4f5a91a7a73e53ec4e1df8d46d7cd75a67663ade6035524a32b01642
+  data.tar.gz: b9b5b3b9cc461fdee3d9b6447f888e68ed2bcd7e504084550118d2c9929e5072
 SHA512:
-  metadata.gz: 59f3a11a7789c4c9bca786cb8ec99b59ed085529b649d4269b439e98c975e5cff97faef3f0b139d10a472b4142d513eba2a3859908cac37a5d9b354996f380ed
-  data.tar.gz: 44ca61a7b14e1ad309bd24afec9d344592b7d399d44c83961e89687ed9557666c4e6f0e65e57268d8dfd178664266757815135cc5b37f5f95abc6814222a0e55
+  metadata.gz: 5c0c813ac266810468a1100dfa7c9baf1af7c889f9a9dc865d796c19baea2d0bcaea7c8f79f6f27e1cbb7fa918f237563eac954735d4dcd77e6aa9f89038b34c
+  data.tar.gz: fe5fdd935be6cf251ab74ecc110178c3a5a07cfdf5aafc7a568db34fea7568bbca218c99c8223d18555079cdc080bd96ba951c4f800937acb94809e3ae89ca0f

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Unreleased
 ----------
 
+22.3.1 (July 26, 2024)
+----------
+- Handle edge case where we attempted to redirect to login when already at the top level [#1887](https://github.com/Shopify/shopify_app/pull/1887)
+
 22.3.0 (July 24, 2024)
 ----------
 - Deprecate `ShopifyApp::JWTMiddleware`. And remove internal usage.  Any existing app code relying on decoded JWT contents set from `request.env` should instead include the `WithShopifyIdToken` concern and call its respective methods. [#1861](https://github.com/Shopify/shopify_app/pull/1861) [Migration Guide](/docs/Upgrading.md#v2300---removed-shopifyappjwtmiddleware)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_app (22.3.0)
+    shopify_app (22.3.1)
       activeresource
       addressable (~> 2.7)
       jwt (>= 2.2.3)

data/app/views/shopify_app/shared/redirect.html.erb

@@ -6,8 +6,13 @@
   <base target="_top">
   <title>Redirecting…</title>
 
+  <%
+    is_iframe = local_assigns.key?(:is_iframe) ? is_iframe : true
+    if is_iframe
+  %>
   <meta name="shopify-api-key" content="<%= ShopifyApp.configuration.api_key %>">
   <%= javascript_include_tag "https://cdn.shopify.com/shopifycloud/app-bridge.js" %>
+  <% end %>
 
   <%= javascript_include_tag('shopify_app/redirect', crossorigin: 'anonymous', integrity: true) %>
 </head>

data/lib/shopify_app/controller_concerns/login_protection.rb

@@ -204,7 +204,7 @@ module ShopifyApp
         render(
           "shopify_app/shared/redirect",
           layout: false,
-          locals: { url: url, current_shopify_domain: current_shopify_domain },
+          locals: { url: url, current_shopify_domain: current_shopify_domain, is_iframe: embedded? },
         )
       else
         redirect_to(url)

data/lib/shopify_app/controller_concerns/sanitized_params.rb

@@ -33,5 +33,9 @@ module ShopifyApp
         end
       end
     end
+
+    def embedded?
+      params[:embedded] == "1" || request.env["HTTP_SEC_FETCH_DEST"] == "iframe"
+    end
   end
 end

data/lib/shopify_app/controller_concerns/token_exchange.rb

@@ -94,10 +94,6 @@ module ShopifyApp
       )
     end
 
-    def embedded?
-      params[:embedded] == "1" || request.env["HTTP_SEC_FETCH_DEST"] == "iframe"
-    end
-
     def online_token_configured?
       ShopifyApp.configuration.online_token_configured?
     end
@@ -108,7 +104,7 @@ module ShopifyApp
       render(
         "shopify_app/shared/redirect",
         layout: false,
-        locals: { url: url, current_shopify_domain: current_shopify_domain },
+        locals: { url: url, current_shopify_domain: current_shopify_domain, is_iframe: embedded? },
       )
     end
   end

data/lib/shopify_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShopifyApp
-  VERSION = "22.3.0"
+  VERSION = "22.3.1"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify_app",
-  "version": "22.3.0",
+  "version": "22.3.1",
   "repository": "git@github.com:Shopify/shopify_app.git",
   "author": "Shopify",
   "license": "MIT",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 22.3.0
+  version: 22.3.1
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource