Change how we check if app is embedded

CHANGELOG.md

@@ -1,6 +1,8 @@
 Unreleased
 ----------
 
+* Internal update, adding App Bridge 3 for redirect (only). [#1458](https://github.com/Shopify/shopify_app/pull/1458)
+
 19.1.0 (June 20, 2022)
 ----------
 

app/assets/javascripts/shopify_app/app_bridge_redirect.js

@@ -1,4 +1,4 @@
-//= require ./app_bridge_2.0.12.js
+//= require ./app_bridge_3.1.1.js
 
 (function(window) {
   function appBridgeRedirect(url) {

app/assets/javascripts/shopify_app/redirect.js

@@ -1,4 +1,5 @@
 //= require ./app_bridge_redirect.js
+//= require ./app_bridge_utils_3.1.1.js
 
 (function () {
   function redirect() {
@@ -10,15 +11,12 @@
 
     var targetInfo = JSON.parse(redirectTargetElement.dataset.target);
 
-    if (window.top == window.self) {
-      // If the current window is the 'parent', change the URL by setting location.href
-      window.top.location.href = targetInfo.url;
-    } else {
-      // If the current window is the 'child' or embedded, change the parent's URL with
-      // App Bridge redirect. This case can happen when an app updates its access scopes,
-      // or the unlikely scenario where the shop thinks the app is installed, but the
-      // app does not have an record for the shop.
+    var appBridgeUtils = window['app-bridge-utils'];
+
+    if (appBridgeUtils.isShopifyEmbedded()) {
       window.appBridgeRedirect(targetInfo.url);
+    } else {
+      window.top.location.href = targetInfo.url;
     }
   }