[1.x] Use Livewire's redirectIntended function (#352)

* bump livewire version * use redirectintended
laravel · Jan 31, 2024 · 4dce985 · 4dce985
1 parent 08bf347
commit 4dce985
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 31 deletions.
diff --git a/src/Console/InstallsLivewireStack.php b/src/Console/InstallsLivewireStack.php
@@ -26,7 +26,7 @@ protected function installLivewireStack($functional = false)
         });
 
         // Install Livewire...
-        if (! $this->requireComposerPackages(['livewire/livewire:^3.0', 'livewire/volt:^1.0'])) {
+        if (! $this->requireComposerPackages(['livewire/livewire:^3.4', 'livewire/volt:^1.0'])) {
             return 1;
         }
 

diff --git a/stubs/livewire-functional/resources/views/livewire/pages/auth/confirm-password.blade.php b/stubs/livewire-functional/resources/views/livewire/pages/auth/confirm-password.blade.php
@@ -28,10 +28,7 @@
 
     session(['auth.password_confirmed_at' => time()]);
 
-    $this->redirect(
-        session('url.intended', RouteServiceProvider::HOME),
-        navigate: true
-    );
+    $this->redirectIntended(default: RouteServiceProvider::HOME, navigate: true);
 };
 
 ?>

diff --git a/stubs/livewire-functional/resources/views/livewire/pages/auth/login.blade.php b/stubs/livewire-functional/resources/views/livewire/pages/auth/login.blade.php
@@ -18,10 +18,7 @@
 
     Session::regenerate();
 
-    $this->redirect(
-        session('url.intended', RouteServiceProvider::HOME),
-        navigate: true
-    );
+    $this->redirectIntended(default: RouteServiceProvider::HOME, navigate: true);
 };
 
 ?>

diff --git a/stubs/livewire-functional/resources/views/livewire/pages/auth/verify-email.blade.php b/stubs/livewire-functional/resources/views/livewire/pages/auth/verify-email.blade.php
@@ -11,10 +11,7 @@
 
 $sendVerification = function () {
     if (Auth::user()->hasVerifiedEmail()) {
-        $this->redirect(
-            session('url.intended', RouteServiceProvider::HOME),
-            navigate: true
-        );
+        $this->redirectIntended(default: RouteServiceProvider::HOME, navigate: true);
 
         return;
     }

diff --git a/...ire-functional/resources/views/livewire/profile/update-profile-information-form.blade.php b/...ire-functional/resources/views/livewire/profile/update-profile-information-form.blade.php
@@ -37,9 +37,7 @@
     $user = Auth::user();
 
     if ($user->hasVerifiedEmail()) {
-        $path = session('url.intended', RouteServiceProvider::HOME);
-
-        $this->redirect($path);
+        $this->redirectIntended(default: RouteServiceProvider::HOME);
 
         return;
     }

diff --git a/stubs/livewire/resources/views/livewire/pages/auth/confirm-password.blade.php b/stubs/livewire/resources/views/livewire/pages/auth/confirm-password.blade.php
@@ -30,10 +30,7 @@ public function confirmPassword(): void
 
         session(['auth.password_confirmed_at' => time()]);
 
-        $this->redirect(
-            session('url.intended', RouteServiceProvider::HOME),
-            navigate: true
-        );
+        $this->redirectIntended(default: RouteServiceProvider::HOME, navigate: true);
     }
 }; ?>
 

diff --git a/stubs/livewire/resources/views/livewire/pages/auth/login.blade.php b/stubs/livewire/resources/views/livewire/pages/auth/login.blade.php
@@ -21,10 +21,7 @@ public function login(): void
 
         Session::regenerate();
 
-        $this->redirect(
-            session('url.intended', RouteServiceProvider::HOME),
-            navigate: true
-        );
+        $this->redirectIntended(default: RouteServiceProvider::HOME, navigate: true);
     }
 }; ?>
 

diff --git a/stubs/livewire/resources/views/livewire/pages/auth/verify-email.blade.php b/stubs/livewire/resources/views/livewire/pages/auth/verify-email.blade.php
@@ -15,10 +15,7 @@
     public function sendVerification(): void
     {
         if (Auth::user()->hasVerifiedEmail()) {
-            $this->redirect(
-                session('url.intended', RouteServiceProvider::HOME),
-                navigate: true
-            );
+            $this->redirectIntended(default: RouteServiceProvider::HOME, navigate: true);
 
             return;
         }

diff --git a/stubs/livewire/resources/views/livewire/profile/update-profile-information-form.blade.php b/stubs/livewire/resources/views/livewire/profile/update-profile-information-form.blade.php
@@ -52,9 +52,7 @@ public function sendVerification(): void
         $user = Auth::user();
 
         if ($user->hasVerifiedEmail()) {
-            $path = session('url.intended', RouteServiceProvider::HOME);
-
-            $this->redirect($path);
+            $this->redirectIntended(default: RouteServiceProvider::HOME);
 
             return;
         }