From d13e1ba2af4fbbdfdeb8e8414bc5f043d710a2fc Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 21 Aug 2020 23:10:14 +0800
Subject: [PATCH] use relative URL for `route` function (fix #222)

---
 app/Http/View/Composers/UserMenuComposer.php                | 2 +-
 app/Http/View/Composers/UserPanelComposer.php               | 2 +-
 resources/views/user/report.twig                            | 2 +-
 resources/views/vendor/passport/authorize.twig              | 4 ++--
 .../ViewTest/ComposersTest/UserMenuComposerTest.php         | 6 +++---
 .../ViewTest/ComposersTest/UserPanelComposerTest.php        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/View/Composers/UserMenuComposer.php b/app/Http/View/Composers/UserMenuComposer.php
index 5c27d86a..94449c4f 100644
--- a/app/Http/View/Composers/UserMenuComposer.php
+++ b/app/Http/View/Composers/UserMenuComposer.php
@@ -23,7 +23,7 @@ class UserMenuComposer
     public function compose(View $view)
     {
         $user = auth()->user();
-        $avatarUrl = route('avatar.texture', ['tid' => $user->avatar, 'size' => 36]);
+        $avatarUrl = route('avatar.texture', ['tid' => $user->avatar, 'size' => 36], false);
         $avatar = $this->filter->apply('user_avatar', $avatarUrl, [$user]);
         $cli = $this->request->is('admin', 'admin/*');
 
diff --git a/app/Http/View/Composers/UserPanelComposer.php b/app/Http/View/Composers/UserPanelComposer.php
index 089ee283..0e42d450 100644
--- a/app/Http/View/Composers/UserPanelComposer.php
+++ b/app/Http/View/Composers/UserPanelComposer.php
@@ -25,7 +25,7 @@ class UserPanelComposer
     {
         /** @var User */
         $user = auth()->user();
-        $avatarUrl = route('avatar.texture', ['tid' => $user->avatar, 'size' => 45]);
+        $avatarUrl = route('avatar.texture', ['tid' => $user->avatar, 'size' => 45], false);
         $avatar = $this->filter->apply('user_avatar', $avatarUrl, [$user]);
 
         $badges = [];
diff --git a/resources/views/user/report.twig b/resources/views/user/report.twig
index f7229d4c..e5d33995 100644
--- a/resources/views/user/report.twig
+++ b/resources/views/user/report.twig
@@ -19,7 +19,7 @@
             <tr>
               <td>
                 {{ report.tid }}&nbsp;
-                <a href="{{ route('skinlib.show', {texture: report.tid}) }}" target="_blank">
+                <a href="{{ route('skinlib.show', {texture: report.tid}, false) }}" target="_blank">
                   <i class="fas fa-share"></i>
                 </a>
               </td>
diff --git a/resources/views/vendor/passport/authorize.twig b/resources/views/vendor/passport/authorize.twig
index 694f00df..daa83c12 100644
--- a/resources/views/vendor/passport/authorize.twig
+++ b/resources/views/vendor/passport/authorize.twig
@@ -9,7 +9,7 @@
 		{{ trans('auth.oauth.authorization.introduction', {name: client.name}) }}
 	</p>
 	<div class="d-flex justify-content-between">
-		<form method="post" action="{{ route('passport.authorizations.approve') }}">
+		<form method="post" action="{{ route('passport.authorizations.approve', {}, false) }}">
 			{{ csrf_field() }}
 			<input type="hidden" name="state" value="{{ request.state }}">
 			<input type="hidden" name="client_id" value="{{ client.id }}">
@@ -18,7 +18,7 @@
 			</button>
 		</form>
 
-		<form method="post" action="{{ route('passport.authorizations.deny') }}">
+		<form method="post" action="{{ route('passport.authorizations.deny', {}, false) }}">
 			{{ csrf_field() }}
 			{{ method_field('DELETE') }}
 			<input type="hidden" name="state" value="{{ request.state }}">
diff --git a/tests/HttpTest/ViewTest/ComposersTest/UserMenuComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/UserMenuComposerTest.php
index 0e32237b..cf1ca676 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/UserMenuComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/UserMenuComposerTest.php
@@ -9,8 +9,8 @@ class UserMenuComposerTest extends TestCase
     public function testAvatar()
     {
         $user = factory(User::class)->create(['avatar' => 5]);
-        $this->actingAs($user)->get('/')->assertSee(url('/avatar/5?size=36'));
-        $this->get('/skinlib')->assertSee(url('/avatar/5?size=36'));
-        $this->get('/user')->assertSee(url('/avatar/5?size=36'));
+        $this->actingAs($user)->get('/')->assertSee('/avatar/5?size=36');
+        $this->get('/skinlib')->assertSee('/avatar/5?size=36');
+        $this->get('/user')->assertSee('/avatar/5?size=36');
     }
 }
diff --git a/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
index c7c47210..caea6442 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
@@ -12,7 +12,7 @@ class UserPanelComposerTest extends TestCase
         $user = factory(User::class)->create();
         $this->actingAs($user);
 
-        $this->get('/user')->assertSee(url('/avatar/0?size=45'));
+        $this->get('/user')->assertSee('/avatar/0?size=45');
     }
 
     public function testBadges()