Redirect users back to previous URL upon sign in

Author: joecampo

src/Http/Requests/AuthKitAuthenticationRequest.php

@@ -6,8 +6,10 @@
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
+use Inertia\Inertia;
 use Laravel\WorkOS\User;
 use Laravel\WorkOS\WorkOS;
+use Symfony\Component\HttpFoundation\Response;
 use WorkOS\UserManagement;
 
 class AuthKitAuthenticationRequest extends FormRequest
@@ -34,7 +36,7 @@ public function authenticate(?callable $findUsing = null, ?callable $createUsing
             $user->user,
             $user->access_token,
             $user->refresh_token,
-            $user->organization_id,
+            $user->organizationId,
         ];
 
         $user = new User(
@@ -66,6 +68,20 @@ public function authenticate(?callable $findUsing = null, ?callable $createUsing
         return $existingUser;
     }
 
+    /**
+     * Redirect the user to the previous or default URL.
+     */
+    public function redirect(string $default = '/'): Response
+    {
+        $url = rtrim(base64_decode($this->session()->get('state')), '/') ?: null;
+
+        $to = $url !== null && $url !== url('/') ? $url : $default;
+
+        return class_exists(Inertia::class)
+            ? Inertia::location($to)
+            : redirect($to);
+    }
+
     /**
      * Find the user with the given WorkOS ID.
      */
@@ -104,7 +120,7 @@ protected function updateUsing(AppUser $user, User $userFromWorkOS): AppUser
      */
     protected function ensureStateIsValid(): void
     {
-        $state = json_decode($this->query('state'), true)['state'] ?? false;
+        $state = json_decode($this->query('state'), true)['state'] ?? null;
 
         if ($state !== $this->session()->get('state')) {
             abort(403);

src/Http/Requests/AuthKitLoginRequest.php

@@ -3,7 +3,6 @@
 namespace Laravel\WorkOS\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Str;
 use Inertia\Inertia;
 use Laravel\WorkOS\WorkOS;
 use Symfony\Component\HttpFoundation\Response;
@@ -20,7 +19,7 @@ public function redirect(): Response
 
         $url = (new UserManagement)->getAuthorizationUrl(
             config('services.workos.redirect_url'),
-            ['state' => $state = Str::random(20)],
+            ['state' => $state = base64_encode(url()->previous())],
             'authkit',
         );