From 78aaa4fb0a9099738cbec5430a5883e931e15573 Mon Sep 17 00:00:00 2001
From: enmaboya <vita-dubov@yandex.ru>
Date: Mon, 11 Nov 2024 17:53:32 +0400
Subject: [PATCH] update tests

---
 src/Traits/AuthController.php                           | 2 +-
 src/resources/views/auth/fullpage_redirect.blade.php    | 2 +-
 src/resources/views/billing/fullpage_redirect.blade.php | 2 +-
 src/resources/views/layouts/default.blade.php           | 2 +-
 src/resources/views/partials/token_handler.blade.php    | 6 +++---
 tests/Traits/AuthControllerTest.php                     | 2 +-
 tests/Traits/BillingControllerTest.php                  | 1 +
 tests/Traits/HomeControllerTest.php                     | 9 +++------
 8 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/Traits/AuthController.php b/src/Traits/AuthController.php
index 3e9ee209..4d034079 100644
--- a/src/Traits/AuthController.php
+++ b/src/Traits/AuthController.php
@@ -64,7 +64,7 @@ public function authenticate(Request $request, AuthenticateShop $authShop)
                 'shopify-app::auth.fullpage_redirect',
                 [
                     'apiKey' => Util::getShopifyConfig('api_key', $shopOrigin),
-                    'authUrl' => $result['url'],
+                    'url' => $result['url'],
                     'host' => $request->get('host'),
                     'shopDomain' => $shopDomain,
                     'locale' => $request->get('locale'),
diff --git a/src/resources/views/auth/fullpage_redirect.blade.php b/src/resources/views/auth/fullpage_redirect.blade.php
index 0c911ca4..e14175f0 100644
--- a/src/resources/views/auth/fullpage_redirect.blade.php
+++ b/src/resources/views/auth/fullpage_redirect.blade.php
@@ -10,7 +10,7 @@
 
         <script type="text/javascript">
             document.addEventListener('DOMContentLoaded', function () {
-                let redirectUrl = "{!! $authUrl !!}";
+                let redirectUrl = "{!! $url !!}";
 
                 if (window.top === window.self) {
                     window.top.location.href = redirectUrl;
diff --git a/src/resources/views/billing/fullpage_redirect.blade.php b/src/resources/views/billing/fullpage_redirect.blade.php
index 0c911ca4..e14175f0 100644
--- a/src/resources/views/billing/fullpage_redirect.blade.php
+++ b/src/resources/views/billing/fullpage_redirect.blade.php
@@ -10,7 +10,7 @@
 
         <script type="text/javascript">
             document.addEventListener('DOMContentLoaded', function () {
-                let redirectUrl = "{!! $authUrl !!}";
+                let redirectUrl = "{!! $url !!}";
 
                 if (window.top === window.self) {
                     window.top.location.href = redirectUrl;
diff --git a/src/resources/views/layouts/default.blade.php b/src/resources/views/layouts/default.blade.php
index fb66892c..b75afaa6 100644
--- a/src/resources/views/layouts/default.blade.php
+++ b/src/resources/views/layouts/default.blade.php
@@ -6,7 +6,7 @@
         <meta name="shopify-api-key" content="{{ config('shopify-app.api_key') }}" />
         <script src="https://cdn.shopify.com/shopifycloud/app-bridge.js"></script>
 
-        <title>{{ \Osiset\ShopifyApp\Util::getShopifyConfig('app_name') }}</title>
+        <title>{{ config('shopify-app.app_name') }}</title>
         @yield('styles')
     </head>
 
diff --git a/src/resources/views/partials/token_handler.blade.php b/src/resources/views/partials/token_handler.blade.php
index e8fced08..a9194b2d 100644
--- a/src/resources/views/partials/token_handler.blade.php
+++ b/src/resources/views/partials/token_handler.blade.php
@@ -1,7 +1,8 @@
 <script>
-    let SESSION_TOKEN_REFRESH_INTERVAL = {{ \Osiset\ShopifyApp\Util::getShopifyConfig('session_token_refresh_interval') }};
+    var SESSION_TOKEN_REFRESH_INTERVAL = {{ config('shopify-app.session_token_refresh_interval') }};
+    var LOAD_EVENT = 'DOMContentLoaded'
 
-    document.addEventListener('DOMContentLoaded', () => {
+    document.addEventListener(LOAD_EVENT, () => {
         retrieveToken();
         keepRetrievingToken();
     });
@@ -29,7 +30,6 @@
         }
 
         if (window.Livewire) {
-            // Works only with Livewire 2
             window.Livewire.hook('request', ({options}) => {
                 options.headers['Authorization'] = `Bearer ${window.sessionToken}`;
                 options.headers['Content-Type'] = 'application/json';
diff --git a/tests/Traits/AuthControllerTest.php b/tests/Traits/AuthControllerTest.php
index a435c7c9..23167a23 100644
--- a/tests/Traits/AuthControllerTest.php
+++ b/tests/Traits/AuthControllerTest.php
@@ -30,7 +30,7 @@ public function testAuthRedirectsToShopifyWhenNoCode(): void
         // Check the redirect happens and location is set properly in the header.
         $response->assertViewHas('shopDomain', 'example.myshopify.com');
         $response->assertViewHas(
-            'authUrl',
+            'url',
             'https://example.myshopify.com/admin/oauth/authorize?client_id='.Util::getShopifyConfig('api_key').'&scope=read_products%2Cwrite_products%2Cread_themes&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate'
         );
 
diff --git a/tests/Traits/BillingControllerTest.php b/tests/Traits/BillingControllerTest.php
index c3011fc9..1ddb89f3 100644
--- a/tests/Traits/BillingControllerTest.php
+++ b/tests/Traits/BillingControllerTest.php
@@ -45,6 +45,7 @@ public function testSendsShopToBillingScreen(): void
 
         // Run the call
         $response = $this->call('get', '/billing', ['shop' => $shop->getDomain()->toNative()]);
+
         $response->assertViewHas(
             'url',
             'https://example.myshopify.com/admin/charges/1029266947/confirm_recurring_application_charge?signature=BAhpBANeWT0%3D--64de8739eb1e63a8f848382bb757b20343eb414f'
diff --git a/tests/Traits/HomeControllerTest.php b/tests/Traits/HomeControllerTest.php
index 934c3b18..2b928412 100644
--- a/tests/Traits/HomeControllerTest.php
+++ b/tests/Traits/HomeControllerTest.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Auth\AuthManager;
 use Osiset\ShopifyApp\Test\TestCase;
-use Osiset\ShopifyApp\Util;
 
 class HomeControllerTest extends TestCase
 {
@@ -27,18 +26,16 @@ public function testHomeRoute(): void
         $host = base64_encode($shop->getDomain()->toNative().'/admin');
         $this->call('get', '/', ['token' => $this->buildToken(), 'host' => $host])
             ->assertOk()
-            ->assertSee('apiKey: "'.Util::getShopifyConfig('api_key').'"', false)
-            ->assertSee("host: \"{$host}\"", false);
+            ->assertSee("https://cdn.shopify.com/shopifycloud/app-bridge.js");
     }
 
     public function testHomeRouteHostAdmin(): void
     {
-        $shop = factory($this->model)->create(['name' => 'shop-name.myshopify.com']);
+        factory($this->model)->create(['name' => 'shop-name.myshopify.com']);
 
         $host = base64_encode('admin.shopify.com/store/shop-name');
         $this->call('get', '/', ['token' => $this->buildToken(), 'host' => $host])
             ->assertOk()
-            ->assertSee('apiKey: "'.Util::getShopifyConfig('api_key').'"', false)
-            ->assertSee("host: \"{$host}\"", false);
+            ->assertSee("https://cdn.shopify.com/shopifycloud/app-bridge.js");
     }
 }