Use fullpage redirect for billing in embedded apps

Shopify · Nov 14, 2022 · 35d8772 · 35d8772
1 parent c63b306
commit 35d8772
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@ Unreleased
 ----------
 * Fixes a bug with `EnsureAuthenticatedLinks` causing deep links to not work [#1549](https://github.com/Shopify/shopify_app/pull/1549)
 * Ensure online token is properly used when using `current_shopify_session` [#1566](https://github.com/Shopify/shopify_app/pull/1566)
+* Fixes a bug with `EnsureBilling` causing infinite redirect in embedded apps [#1578](https://github.com/Shopify/shopify_app/pull/1578)
 
 21.2.0 (Oct 25, 2022)
 ----------

diff --git a/lib/shopify_app/controller_concerns/ensure_billing.rb b/lib/shopify_app/controller_concerns/ensure_billing.rb
@@ -29,6 +29,8 @@ def check_billing(session = current_shopify_session)
         if request.xhr?
           add_top_level_redirection_headers(url: confirmation_url, ignore_response_code: true)
           head(:unauthorized)
+        elsif ShopifyApp.configuration.embedded_app?
+          fullpage_redirect_to(confirmation_url)
         else
           redirect_to(confirmation_url, allow_other_host: true)
         end

diff --git a/test/controllers/concerns/ensure_billing_test.rb b/test/controllers/concerns/ensure_billing_test.rb
@@ -59,7 +59,9 @@ def index
 
     get :index
 
-    assert_redirected_to(%r{^https://totally-real-url})
+    assert_response :success
+    assert_match "Redirecting", response.body
+    assert_match(%r{https://totally-real-url}, response.body)
 
     get :index, xhr: true
 
@@ -96,7 +98,9 @@ def index
 
     get :index
 
-    assert_redirected_to(%r{^https://totally-real-url})
+    assert_response :success
+    assert_match "Redirecting", response.body
+    assert_match(%r{https://totally-real-url}, response.body)
 
     get :index, xhr: true
 
@@ -162,7 +166,9 @@ def index
 
     get :index
 
-    assert_redirected_to(%r{^https://totally-real-url})
+    assert_response :success
+    assert_match "Redirecting", response.body
+    assert_match(%r{https://totally-real-url}, response.body)
 
     get :index, xhr: true