Fixed Dusk authorization tests to support Laravel 10 and 11

* Unified redirect behavior when user is authorized * Allow laravel 10 * Fixed code style --------- Co-authored-by: tabuna <5102591+tabuna@users.noreply.github.com>
orchidsoftware · Feb 4, 2025 · c58d0d1 · c58d0d1
1 parent 1d4f015
commit c58d0d1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/Platform/Http/Controllers/LoginController.php b/src/Platform/Http/Controllers/LoginController.php
@@ -4,7 +4,10 @@
 
 namespace Orchid\Platform\Http\Controllers;
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 use Illuminate\Auth\EloquentUserProvider;
+use Illuminate\Auth\Middleware\RedirectIfAuthenticated;
 use Illuminate\Contracts\Auth\Factory as Auth;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\View\Factory;
@@ -41,7 +44,17 @@ public function __construct(Auth $auth)
     {
         $this->guard = $auth->guard(config('platform.guard'));
 
-        $this->middleware('guest', [
+        /**
+         * @deprecated logic for older Laravel versions
+         */
+        $middleware = 'guest';
+
+        if (InstalledVersions::satisfies(new VersionParser, 'laravel/framework', '>11.17.0')) {
+            $middleware = RedirectIfAuthenticated::class;
+            RedirectIfAuthenticated::redirectUsing(static fn () => route(config('platform.index')));
+        }
+
+        $this->middleware($middleware, [
             'except' => [
                 'logout',
                 'switchLogout',

diff --git a/tests/Browser/LoginTest.php b/tests/Browser/LoginTest.php
@@ -36,15 +36,15 @@ public function testLogout(): void
             // Redirect to home
             $browser
                 ->visitRoute('platform.login')
-                ->waitForLocation('/');
+                ->waitForRoute(config('platform.index'));
 
             // Logout
             $browser
                 ->visitRoute('platform.profile')
                 ->clickLink($user->name)
                 ->waitForText('Sign out')
                 ->press('Sign out')
-                ->waitForText('404');
+                ->waitForRoute('platform.login');
 
             // Redirect to login
             $browser

diff --git a/tests/Feature/Platform/AuthTest.php b/tests/Feature/Platform/AuthTest.php
@@ -26,7 +26,9 @@ public function testRouteDashboardLoginAuth(): void
         $this->assertTrue(
             // Home for Laravel 10.x and earlier
             // '/' for Laravel 11.x and later
-            $response->isRedirect(url('/home')) || $response->isRedirect(url('/'))
+            $response->isRedirect(url('/home'))
+                || $response->isRedirect(url('/'))
+                || $response->isRedirect(route(config('platform.index')))
         );
     }