From 43f711e3b7e00cf1d6497469c4c085294dd76c8d Mon Sep 17 00:00:00 2001
From: Gulshan <17927306+Guley@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:19:19 +0530
Subject: [PATCH 1/4] Update default.blade.php

Update app bridge and util as per the new update from the shopify
---
 src/resources/views/layouts/default.blade.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/resources/views/layouts/default.blade.php b/src/resources/views/layouts/default.blade.php
index 313e2bfd..b7fb4dc9 100644
--- a/src/resources/views/layouts/default.blade.php
+++ b/src/resources/views/layouts/default.blade.php
@@ -19,7 +19,8 @@
 
         @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled') && \Osiset\ShopifyApp\Util::useNativeAppBridge())
             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
-            <script
+             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_util_version') ? '@'.config('shopify-app.appbridge_util_version') : '' }}"></script>
+        <script
                 @if(\Osiset\ShopifyApp\Util::getShopifyConfig('turbo_enabled'))
                     data-turbolinks-eval="false"
                 @endif
@@ -30,7 +31,7 @@
                 var createApp = AppBridge.default;
                 var app = createApp({
                     apiKey: "{{ \Osiset\ShopifyApp\Util::getShopifyConfig('api_key', $shopDomain ?? Auth::user()->name ) }}",
-                    host: "{{ \Request::get('host') }}",
+                    host: "{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_host') ? config('shopify-app.appbridge_host') : '' }}",
                     forceRedirect: true,
                 });
             </script>

From 757fc4b0bd4b1489c76c019b29604fa95892afa3 Mon Sep 17 00:00:00 2001
From: Gulshan <17927306+Guley@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:21:22 +0530
Subject: [PATCH 2/4] Update shopify-app.php

Add configuration for app bridge
---
 src/resources/config/shopify-app.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php
index 6eaae41a..55bc70d4 100644
--- a/src/resources/config/shopify-app.php
+++ b/src/resources/config/shopify-app.php
@@ -139,8 +139,9 @@
 
     // Use semver range to link to a major or minor version number.
     // Leaving empty will use the latest version - not recommended in production.
-    'appbridge_version' => env('SHOPIFY_APPBRIDGE_VERSION', 'latest'),
-
+   'appbridge_version' => env('SHOPIFY_APPBRIDGE_VERSION', '3.7.10'),
+    'appbridge_utils_version' => env('SHOPIFY_APPBRIDGE_UTILS_VERSION', '3.5.1'),
+    'appbridge_host' => env('SHOPIFY_HOST_VERSION', base64_encode('admin.shopify.com/store/storename')),
     // Set a new CDN URL if you want to host the AppBridge JS yourself or unpkg goes down.
     // DO NOT include a trailing slash.
     'appbridge_cdn_url' => env('SHOPIFY_APPBRIDGE_CDN_URL', 'https://unpkg.com'),

From 6cc1f666e4e6efdfbdcd2767df3da8db70ba4591 Mon Sep 17 00:00:00 2001
From: Gulshan <17927306+Guley@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:23:27 +0530
Subject: [PATCH 3/4] Update default.blade.php

change config variable name
---
 src/resources/views/layouts/default.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/views/layouts/default.blade.php b/src/resources/views/layouts/default.blade.php
index b7fb4dc9..7aae3fff 100644
--- a/src/resources/views/layouts/default.blade.php
+++ b/src/resources/views/layouts/default.blade.php
@@ -19,7 +19,7 @@
 
         @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled') && \Osiset\ShopifyApp\Util::useNativeAppBridge())
             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
-             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_util_version') ? '@'.config('shopify-app.appbridge_util_version') : '' }}"></script>
+             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_utils_version') ? '@'.config('shopify-app.appbridge_util_version') : '' }}"></script>
         <script
                 @if(\Osiset\ShopifyApp\Util::getShopifyConfig('turbo_enabled'))
                     data-turbolinks-eval="false"

From 887d223ccd8bd6fa2f789445c2f444bf336c059a Mon Sep 17 00:00:00 2001
From: Gulshan <17927306+Guley@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:24:01 +0530
Subject: [PATCH 4/4] Update default.blade.php

config update for script
---
 src/resources/views/layouts/default.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/views/layouts/default.blade.php b/src/resources/views/layouts/default.blade.php
index 7aae3fff..45143b42 100644
--- a/src/resources/views/layouts/default.blade.php
+++ b/src/resources/views/layouts/default.blade.php
@@ -19,7 +19,7 @@
 
         @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled') && \Osiset\ShopifyApp\Util::useNativeAppBridge())
             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
-             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_utils_version') ? '@'.config('shopify-app.appbridge_util_version') : '' }}"></script>
+             <script src="{{config('shopify-app.appbridge_cdn_url') ?? 'https://unpkg.com'}}/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_utils_version') ? '@'.config('shopify-app.appbridge_utils_version') : '' }}"></script>
         <script
                 @if(\Osiset\ShopifyApp\Util::getShopifyConfig('turbo_enabled'))
                     data-turbolinks-eval="false"