oauth login pass returnto parameter

xiaomlove · Mar 8, 2024 · a2b8ef3 · a2b8ef3
1 parent e551a66
commit a2b8ef3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -50,7 +50,8 @@ public function register()
             }
         });
         $this->renderable(function (PassportAuthenticationException $e) {
-            return response()->redirectTo(getSchemeAndHttpHost() . "/login.php");
+            $request = request();
+            return response()->redirectTo(sprintf("%s/login.php?returnto=%s", $request->getSchemeAndHttpHost(), urlencode($request->fullUrl())));
         });
 
         //Other Only handle in json request

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -15,7 +15,7 @@ class Authenticate extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return getBaseUrl() . '/login.php';
+            return sprintf("%s/login.php?returnto=%s", $request->getSchemeAndHttpHost(), urlencode($request->fullUrl()));
         }
     }
 }
diff --git a/app/Http/Middleware/NexusAuth.php b/app/Http/Middleware/NexusAuth.php
@@ -15,7 +15,7 @@ class NexusAuth extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return getBaseUrl() . '/login.php';
+            return sprintf("%s/login.php?returnto=%s", $request->getSchemeAndHttpHost(), urlencode($request->fullUrl()));
         }
     }
 }