From 9ad78396f7de9ab066c75135daa7ea41233dcc01 Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 24 Jul 2022 20:06:59 +0400
Subject: [PATCH 01/17] update config, add spa variable

---
 src/resources/config/shopify-app.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php
index 13338313..c4a3ab2e 100644
--- a/src/resources/config/shopify-app.php
+++ b/src/resources/config/shopify-app.php
@@ -470,5 +470,15 @@
         * The table name for Plan model.
         */
         'plans' => 'plans',
-    ]
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Determines whether the SPA is used
+    |--------------------------------------------------------------------------
+    |
+    | If you use SPA (React or Vue), you don't need a redirect to the JWT token retrieval page
+    |
+    */
+    'spa_frontend_used' => (bool) env('SHOPIFY_SPA_FRONTEND_USED', false),
 ];

From cfb1d5f4b7027f103968b86d1180f8b4a9446c6a Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 24 Jul 2022 20:08:38 +0400
Subject: [PATCH 02/17] Continue if app already installed and has access token
 and not deleted

---
 src/Http/Middleware/VerifyShopify.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Http/Middleware/VerifyShopify.php b/src/Http/Middleware/VerifyShopify.php
index 4cd8d635..dfe49319 100644
--- a/src/Http/Middleware/VerifyShopify.php
+++ b/src/Http/Middleware/VerifyShopify.php
@@ -101,6 +101,14 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
+        if (Util::getShopifyConfig('spa_frontend_used')) {
+            $storeResult = $this->checkPreviousInstallation($request);
+
+            if ($storeResult) {
+                return $next($request);
+            }
+        }
+
         $tokenSource = $this->getAccessTokenFromRequest($request);
         if ($tokenSource === null) {
             //Check if there is a store record in the database

From 62158d777b5fe65de97280a5241f4553f7b3e90e Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 24 Jul 2022 20:15:29 +0400
Subject: [PATCH 03/17] disable cdn app bridge if spa used

---
 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 6c73a662..e21839b9 100644
--- a/src/resources/views/layouts/default.blade.php
+++ b/src/resources/views/layouts/default.blade.php
@@ -17,7 +17,7 @@
             </div>
         </div>
 
-        @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled'))
+        @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled') && !\Osiset\ShopifyApp\Util::getShopifyConfig('spa_frontend_used'))
             <script src="https://unpkg.com/@shopify/app-bridge{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
             <script src="https://unpkg.com/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
             <script

From a5ae5c34582b451530892cc4f1cb47b1decc3e2a Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 24 Jul 2022 22:10:52 +0400
Subject: [PATCH 04/17] update verify

---
 src/Http/Middleware/VerifyShopify.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Http/Middleware/VerifyShopify.php b/src/Http/Middleware/VerifyShopify.php
index dfe49319..3aa02068 100644
--- a/src/Http/Middleware/VerifyShopify.php
+++ b/src/Http/Middleware/VerifyShopify.php
@@ -102,7 +102,7 @@ public function handle(Request $request, Closure $next)
         }
 
         if (Util::getShopifyConfig('spa_frontend_used')) {
-            $storeResult = $this->checkPreviousInstallation($request);
+            $storeResult = !$this->isApiRequest($request) && $this->checkPreviousInstallation($request);
 
             if ($storeResult) {
                 return $next($request);
@@ -110,6 +110,7 @@ public function handle(Request $request, Closure $next)
         }
 
         $tokenSource = $this->getAccessTokenFromRequest($request);
+
         if ($tokenSource === null) {
             //Check if there is a store record in the database
             return $this->checkPreviousInstallation($request)

From 0a89f67c5ad265fb6d2cf7402e22dfdd6f326966 Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 18:55:44 +0400
Subject: [PATCH 05/17] add util helper

---
 src/Util.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Util.php b/src/Util.php
index b468e0f4..e084fbcf 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Str;
 use LogicException;
 use Osiset\ShopifyApp\Objects\Values\Hmac;
+use Osiset\ShopifyApp\Objects\Enums\FrontendEngine;
 
 /**
  * Utilities and helpers used in various parts of the package.
@@ -230,4 +231,22 @@ public static function getShopsTableForeignKey(): string
     {
         return Str::singular(self::getShopsTable()).'_id';
     }
+
+    /**
+     * Checking to see if you need to use the native App Bridge
+     *
+     * @return boolean
+     */
+    public static function useNativeAppBridge(): bool
+    {
+        $currentFrontendEngine = self::getShopifyConfig('frontend_engine') ?? FrontendEngine::BLADE;
+
+        switch ($currentFrontendEngine) {
+            case FrontendEngine::REACT:
+                return false;
+
+            default:
+                return true;
+        }
+    }
 }

From e246ed85a37cfd2922412df6074d94b93c994a1f Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 18:55:57 +0400
Subject: [PATCH 06/17] update validation

---
 src/Http/Middleware/VerifyShopify.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Middleware/VerifyShopify.php b/src/Http/Middleware/VerifyShopify.php
index 2b58d23e..c312ffd5 100644
--- a/src/Http/Middleware/VerifyShopify.php
+++ b/src/Http/Middleware/VerifyShopify.php
@@ -101,7 +101,7 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
-        if (Util::getShopifyConfig('spa_frontend_used')) {
+        if (!Util::useNativeAppBridge()) {
             $storeResult = !$this->isApiRequest($request) && $this->checkPreviousInstallation($request);
 
             if ($storeResult) {

From 3e7297fc5f7b1478ea8d164c6e5411f2230770a3 Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 18:56:07 +0400
Subject: [PATCH 07/17] add frontend engine enum

---
 src/Objects/Enums/FrontendEngine.php | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/Objects/Enums/FrontendEngine.php

diff --git a/src/Objects/Enums/FrontendEngine.php b/src/Objects/Enums/FrontendEngine.php
new file mode 100644
index 00000000..83eb9465
--- /dev/null
+++ b/src/Objects/Enums/FrontendEngine.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Osiset\ShopifyApp\Objects\Enums;
+
+use Funeralzone\ValueObjects\Enums\EnumTrait;
+use Funeralzone\ValueObjects\ValueObject;
+
+/**
+ * Online Store 2.0 theme support
+ */
+class FrontendEngine implements ValueObject
+{
+    use EnumTrait;
+
+    /**
+     * Laravel Blade
+     *
+     * @var int
+     */
+    public const BLADE = 0;
+
+    /**
+     * Vue.js
+     *
+     * @var int
+     */
+    public const VUE = 1;
+
+    /**
+     * React
+     *
+     * @var int
+     */
+    public const REACT = 2;
+}

From 365fd34130309c02cdc5bfe318c8b91207a0a9d4 Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 18:56:22 +0400
Subject: [PATCH 08/17] update frontend validation

---
 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 e21839b9..8ed7fb28 100644
--- a/src/resources/views/layouts/default.blade.php
+++ b/src/resources/views/layouts/default.blade.php
@@ -17,7 +17,7 @@
             </div>
         </div>
 
-        @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled') && !\Osiset\ShopifyApp\Util::getShopifyConfig('spa_frontend_used'))
+        @if(\Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_enabled') && \Osiset\ShopifyApp\Util::useNativeAppBridge())
             <script src="https://unpkg.com/@shopify/app-bridge{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
             <script src="https://unpkg.com/@shopify/app-bridge-utils{{ \Osiset\ShopifyApp\Util::getShopifyConfig('appbridge_version') ? '@'.config('shopify-app.appbridge_version') : '' }}"></script>
             <script

From 7e75aba7ae00e39d903957fac80d95b0f061953c Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 19:03:13 +0400
Subject: [PATCH 09/17] add frontend_engine config setting

---
 src/resources/config/shopify-app.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php
index 815f4859..5107e5ba 100644
--- a/src/resources/config/shopify-app.php
+++ b/src/resources/config/shopify-app.php
@@ -477,15 +477,18 @@
         'shops' => 'users',
     ],
 
+    'session_token_refresh_interval' => env('SESSION_TOKEN_REFRESH_INTERVAL', 2000),
+
     /*
     |--------------------------------------------------------------------------
-    | Determines whether the SPA is used
+    | Frontend engine used
     |--------------------------------------------------------------------------
     |
-    | If you use SPA (React or Vue), you don't need a redirect to the JWT token retrieval page
+    | Available engines: BLADE, VUE, REACT.
+    | For example, if you use React, you do not need to be redirected to a separate page to get the JWT token.
+    |
+    | No changes are made for Vue.js and Blade.
     |
     */
-    'spa_frontend_used' => (bool) env('SHOPIFY_SPA_FRONTEND_USED', false),,
-
-    'session_token_refresh_interval' => env('SESSION_TOKEN_REFRESH_INTERVAL', 2000),
+    'frontend_engine' => \Osiset\ShopifyApp\Objects\Enums\FrontendEngine::BLADE
 ];

From 40a058c10444f4508e7fc0ed768c1913f33bcdeb Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 19:04:42 +0400
Subject: [PATCH 10/17] linter fix

---
 src/Util.php                         | 4 ++--
 src/resources/config/shopify-app.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Util.php b/src/Util.php
index e084fbcf..7e367dc7 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -6,8 +6,8 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use LogicException;
-use Osiset\ShopifyApp\Objects\Values\Hmac;
 use Osiset\ShopifyApp\Objects\Enums\FrontendEngine;
+use Osiset\ShopifyApp\Objects\Values\Hmac;
 
 /**
  * Utilities and helpers used in various parts of the package.
@@ -235,7 +235,7 @@ public static function getShopsTableForeignKey(): string
     /**
      * Checking to see if you need to use the native App Bridge
      *
-     * @return boolean
+     * @return bool
      */
     public static function useNativeAppBridge(): bool
     {
diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php
index 5107e5ba..41aeb860 100644
--- a/src/resources/config/shopify-app.php
+++ b/src/resources/config/shopify-app.php
@@ -490,5 +490,5 @@
     | No changes are made for Vue.js and Blade.
     |
     */
-    'frontend_engine' => \Osiset\ShopifyApp\Objects\Enums\FrontendEngine::BLADE
+    'frontend_engine' => \Osiset\ShopifyApp\Objects\Enums\FrontendEngine::BLADE,
 ];

From c52b114be80135776bc71a738871c99364667dff Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Sun, 11 Sep 2022 19:16:59 +0400
Subject: [PATCH 11/17] add tests

---
 tests/UtilTest.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 7b172959..4632bce2 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Config;
 use LogicException;
+use Osiset\ShopifyApp\Objects\Enums\FrontendEngine;
 use Osiset\ShopifyApp\Util;
 use stdClass;
 
@@ -105,4 +106,22 @@ public function testGraphQLWebhookTopic(): void
             Util::getGraphQLWebhookTopic('ORDERS_PARTIALLY_FULFILLED')
         );
     }
+
+    public function testUseNativeAppBridgeIsTrue(): void
+    {
+        Config::set('shopify-app.frontend_engine', FrontendEngine::VUE);
+
+        $result = Util::useNativeAppBridge();
+
+        $this->assertTrue($result);
+    }
+
+    public function testUseNativeAppBridgeIsFalse(): void
+    {
+        Config::set('shopify-app.frontend_engine', FrontendEngine::REACT);
+
+        $result = Util::useNativeAppBridge();
+
+        $this->assertFalse($result);
+    }
 }

From b8ec01a2a098771ba928828829499d6c9c355853 Mon Sep 17 00:00:00 2001
From: vdubov <vitaliy.dubov@bolide.ai>
Date: Mon, 12 Sep 2022 19:01:25 +0400
Subject: [PATCH 12/17] simplified verification

---
 src/Util.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Util.php b/src/Util.php
index 7e367dc7..9cc59811 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -241,12 +241,6 @@ public static function useNativeAppBridge(): bool
     {
         $currentFrontendEngine = self::getShopifyConfig('frontend_engine') ?? FrontendEngine::BLADE;
 
-        switch ($currentFrontendEngine) {
-            case FrontendEngine::REACT:
-                return false;
-
-            default:
-                return true;
-        }
+        return !$currentFrontendEngine->isSame(FrontendEngine::REACT);
     }
 }

From 7c10b93ed4fe7384b732203dd70402c1a79b86cc Mon Sep 17 00:00:00 2001
From: Tyler King <tyler@osiset.com>
Date: Mon, 12 Sep 2022 13:23:40 -0230
Subject: [PATCH 13/17] Fixes issue comparing enum for `useNativeAppBridge`
 utility method

---
 src/Util.php                         | 4 ++--
 src/resources/config/shopify-app.php | 2 +-
 tests/UtilTest.php                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Util.php b/src/Util.php
index 9cc59811..ca2934c5 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -239,8 +239,8 @@ public static function getShopsTableForeignKey(): string
      */
     public static function useNativeAppBridge(): bool
     {
-        $currentFrontendEngine = self::getShopifyConfig('frontend_engine') ?? FrontendEngine::BLADE;
+        $currentFrontendEngine = self::getShopifyConfig('frontend_engine') ?? FrontendEngine::BLADE();
 
-        return !$currentFrontendEngine->isSame(FrontendEngine::REACT);
+        return !$currentFrontendEngine->isSame(FrontendEngine::REACT());
     }
 }
diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php
index 41aeb860..71e582d2 100644
--- a/src/resources/config/shopify-app.php
+++ b/src/resources/config/shopify-app.php
@@ -490,5 +490,5 @@
     | No changes are made for Vue.js and Blade.
     |
     */
-    'frontend_engine' => \Osiset\ShopifyApp\Objects\Enums\FrontendEngine::BLADE,
+    'frontend_engine' => \Osiset\ShopifyApp\Objects\Enums\FrontendEngine::BLADE(),
 ];
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 4632bce2..6e0da953 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -109,7 +109,7 @@ public function testGraphQLWebhookTopic(): void
 
     public function testUseNativeAppBridgeIsTrue(): void
     {
-        Config::set('shopify-app.frontend_engine', FrontendEngine::VUE);
+        Config::set('shopify-app.frontend_engine', FrontendEngine::VUE());
 
         $result = Util::useNativeAppBridge();
 
@@ -118,7 +118,7 @@ public function testUseNativeAppBridgeIsTrue(): void
 
     public function testUseNativeAppBridgeIsFalse(): void
     {
-        Config::set('shopify-app.frontend_engine', FrontendEngine::REACT);
+        Config::set('shopify-app.frontend_engine', FrontendEngine::REACT());
 
         $result = Util::useNativeAppBridge();
 

From 6c66fb832a745b1211507ff43f6aca1def223833 Mon Sep 17 00:00:00 2001
From: Tyler King <tyler@osiset.com>
Date: Mon, 12 Sep 2022 13:28:10 -0230
Subject: [PATCH 14/17] Changes test to ensure all tests use app config over
 Config::set for consistency

---
 tests/UtilTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 6e0da953..832563c3 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -69,7 +69,7 @@ public function testRouteNames(): void
 
     public function testGetShopifyConfig(): void
     {
-        Config::set('shopify-app.config_api_callback', function (string $key, $shop) {
+        $this->app['config']->set('shopify-app.config_api_callback', function (string $key, $shop) {
             if ($key === 'api_secret') {
                 return 'hello world';
             }
@@ -109,7 +109,7 @@ public function testGraphQLWebhookTopic(): void
 
     public function testUseNativeAppBridgeIsTrue(): void
     {
-        Config::set('shopify-app.frontend_engine', FrontendEngine::VUE());
+        $this->app['config']->set('shopify-app.frontend_engine', FrontendEngine::VUE());
 
         $result = Util::useNativeAppBridge();
 
@@ -118,7 +118,7 @@ public function testUseNativeAppBridgeIsTrue(): void
 
     public function testUseNativeAppBridgeIsFalse(): void
     {
-        Config::set('shopify-app.frontend_engine', FrontendEngine::REACT());
+        $this->app['config']->set('shopify-app.frontend_engine', FrontendEngine::REACT());
 
         $result = Util::useNativeAppBridge();
 

From 638aeea529db167643b02c17d26fb5c6a47aafa0 Mon Sep 17 00:00:00 2001
From: Tyler King <tyler@osiset.com>
Date: Mon, 12 Sep 2022 13:28:18 -0230
Subject: [PATCH 15/17] Changes test to ensure all tests use app config over
 Config::set for consistency

---
 src/Services/CookieHelper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Services/CookieHelper.php b/src/Services/CookieHelper.php
index 63b8c997..42d063ee 100644
--- a/src/Services/CookieHelper.php
+++ b/src/Services/CookieHelper.php
@@ -47,11 +47,11 @@ public function __construct()
      */
     public function setCookiePolicy(): void
     {
-        Config::set('session.expire_on_close', true);
+        $this->app['config']->set('session.expire_on_close', true);
 
         if ($this->checkSameSiteNoneCompatible()) {
-            Config::set('session.secure', true);
-            Config::set('session.same_site', 'none');
+            $this->app['config']->set('session.secure', true);
+            $this->app['config']->set('session.same_site', 'none');
         }
     }
 

From 2a1acca2ce59886f5cd814bf1d032af183d73413 Mon Sep 17 00:00:00 2001
From: Tyler King <tyler@osiset.com>
Date: Mon, 12 Sep 2022 13:34:52 -0230
Subject: [PATCH 16/17] Changes enum/config setup for app bridge configuration
 to be string based

---
 src/Services/CookieHelper.php        | 6 +++---
 src/Util.php                         | 4 +++-
 src/resources/config/shopify-app.php | 5 ++---
 tests/UtilTest.php                   | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Services/CookieHelper.php b/src/Services/CookieHelper.php
index 42d063ee..63b8c997 100644
--- a/src/Services/CookieHelper.php
+++ b/src/Services/CookieHelper.php
@@ -47,11 +47,11 @@ public function __construct()
      */
     public function setCookiePolicy(): void
     {
-        $this->app['config']->set('session.expire_on_close', true);
+        Config::set('session.expire_on_close', true);
 
         if ($this->checkSameSiteNoneCompatible()) {
-            $this->app['config']->set('session.secure', true);
-            $this->app['config']->set('session.same_site', 'none');
+            Config::set('session.secure', true);
+            Config::set('session.same_site', 'none');
         }
     }
 
diff --git a/src/Util.php b/src/Util.php
index ca2934c5..88d40de4 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -239,7 +239,9 @@ public static function getShopsTableForeignKey(): string
      */
     public static function useNativeAppBridge(): bool
     {
-        $currentFrontendEngine = self::getShopifyConfig('frontend_engine') ?? FrontendEngine::BLADE();
+        $currentFrontendEngine = FrontendEngine::fromNative(
+            self::getShopifyConfig('frontend_engine') ?? 'BLADE'
+        );
 
         return !$currentFrontendEngine->isSame(FrontendEngine::REACT());
     }
diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php
index 71e582d2..d2dec331 100644
--- a/src/resources/config/shopify-app.php
+++ b/src/resources/config/shopify-app.php
@@ -484,11 +484,10 @@
     | Frontend engine used
     |--------------------------------------------------------------------------
     |
-    | Available engines: BLADE, VUE, REACT.
+    | Available engines: "BLADE", "VUE", or "REACT".
     | For example, if you use React, you do not need to be redirected to a separate page to get the JWT token.
-    |
     | No changes are made for Vue.js and Blade.
     |
     */
-    'frontend_engine' => \Osiset\ShopifyApp\Objects\Enums\FrontendEngine::BLADE(),
+    'frontend_engine' => env('SHOPIFY_FRONTEND_ENGINE', 'BLADE'),
 ];
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 832563c3..5709781c 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -109,7 +109,7 @@ public function testGraphQLWebhookTopic(): void
 
     public function testUseNativeAppBridgeIsTrue(): void
     {
-        $this->app['config']->set('shopify-app.frontend_engine', FrontendEngine::VUE());
+        $this->app['config']->set('shopify-app.frontend_engine', 'VUE');
 
         $result = Util::useNativeAppBridge();
 
@@ -118,7 +118,7 @@ public function testUseNativeAppBridgeIsTrue(): void
 
     public function testUseNativeAppBridgeIsFalse(): void
     {
-        $this->app['config']->set('shopify-app.frontend_engine', FrontendEngine::REACT());
+        $this->app['config']->set('shopify-app.frontend_engine', 'REACT');
 
         $result = Util::useNativeAppBridge();
 

From 325f2c1f705fca60159e4f96c042832b3222bffd Mon Sep 17 00:00:00 2001
From: Tyler King <tyler@osiset.com>
Date: Mon, 12 Sep 2022 13:39:54 -0230
Subject: [PATCH 17/17] Fixes to solve undefined magic method for frontend
 engine

---
 src/Util.php       | 5 +++--
 tests/UtilTest.php | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Util.php b/src/Util.php
index 88d40de4..67a5a3e1 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -239,10 +239,11 @@ public static function getShopsTableForeignKey(): string
      */
     public static function useNativeAppBridge(): bool
     {
-        $currentFrontendEngine = FrontendEngine::fromNative(
+        $frontendEngine = FrontendEngine::fromNative(
             self::getShopifyConfig('frontend_engine') ?? 'BLADE'
         );
+        $reactEngine = FrontendEngine::fromNative('REACT');
 
-        return !$currentFrontendEngine->isSame(FrontendEngine::REACT());
+        return !$frontendEngine->isSame($reactEngine);
     }
 }
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 5709781c..13cff9aa 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Facades\Config;
 use LogicException;
-use Osiset\ShopifyApp\Objects\Enums\FrontendEngine;
 use Osiset\ShopifyApp\Util;
 use stdClass;