From 70f4b5b33c2b23faebee313b32444a5b84d961c3 Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Thu, 2 Feb 2023 14:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helpers/Auth/AuthenticatesUsers.php     | 2 +-
 app/Http/Controllers/Web/AuthController.php | 3 +++
 resources/views/auth/request.blade.php      | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/Auth/AuthenticatesUsers.php b/app/Helpers/Auth/AuthenticatesUsers.php
index a761f1f..1070b14 100644
--- a/app/Helpers/Auth/AuthenticatesUsers.php
+++ b/app/Helpers/Auth/AuthenticatesUsers.php
@@ -109,7 +109,7 @@ protected function credentials(Request $request): array
      * @param  Request  $request
      * @return JsonResponse|RedirectResponse
      */
-    protected function sendLoginResponse(Request $request)
+    protected function sendLoginResponse(Request $request): JsonResponse|RedirectResponse
     {
         $request->session()->regenerate();
 
diff --git a/app/Http/Controllers/Web/AuthController.php b/app/Http/Controllers/Web/AuthController.php
index 12f1567..e7ce8cb 100644
--- a/app/Http/Controllers/Web/AuthController.php
+++ b/app/Http/Controllers/Web/AuthController.php
@@ -114,6 +114,9 @@ public function showAuthRequest($token): View|RedirectResponse
             return redirect()->route('index')->with('error', '登录请求的 Token 已被使用。');
         }
 
+        // 登录后跳转的地址
+        session(['url.intended' => route('auth_request.show', $token)]);
+
         return view('auth.request', [
             'data' => $data,
         ]);
diff --git a/resources/views/auth/request.blade.php b/resources/views/auth/request.blade.php
index 891e258..da50ef3 100644
--- a/resources/views/auth/request.blade.php
+++ b/resources/views/auth/request.blade.php
@@ -9,12 +9,15 @@
     <p>{{ $data['description'] }}</p>
 
     @auth('web')
-
         <form method="POST" action="{{ route('auth_request.store') }}">
             @csrf
             <input type="hidden" name="token" value="{{ $data['token'] }}">
             <button type="submit" class="btn btn-primary">同意</button>
         </form>
+    @else
+        <p>
+            在继续之前，请先<a href="{{ route('login') }}">登录</a>或<a href="{{ route('register') }}">注册</a>。
+        </p>
 
     @endauth