diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php deleted file mode 100644 index ddcf6e726..000000000 --- a/app/Http/Kernel.php +++ /dev/null @@ -1,101 +0,0 @@ - [ - EncryptCookies::class, - AddQueuedCookiesToResponse::class, - StartSession::class, - ShareErrorsFromSession::class, - VerifyCsrfToken::class, - SubstituteBindings::class, - LanguageMiddleware::class, - ], - 'api' => [ - EnsureStatefulRequests::class, - 'auth:sanctum', - IsValidJson::class, - TrackAPIKey::class, - RequireTwoFactorAuthentication::class, - AuthenticateIPAccess::class, - ], - 'application-api' => [ - SubstituteBindings::class, - AuthenticateApplicationUser::class, - ], - 'client-api' => [ - SubstituteClientBindings::class, - RequireClientApiKey::class, - ], - 'daemon' => [ - SubstituteBindings::class, - DaemonAuthenticate::class, - ], - ]; - - /** - * The application's route middleware. - */ - protected $middlewareAliases = [ - 'auth' => Authenticate::class, - 'auth.basic' => AuthenticateWithBasicAuth::class, - 'auth.session' => AuthenticateSession::class, - 'guest' => RedirectIfAuthenticated::class, - 'csrf' => VerifyCsrfToken::class, - 'throttle' => ThrottleRequests::class, - 'can' => Authorize::class, - 'bindings' => SubstituteBindings::class, - 'recaptcha' => VerifyReCaptcha::class, - 'node.maintenance' => MaintenanceMiddleware::class, - ]; -} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 48d8bc91d..73330b3c0 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -4,10 +4,10 @@ namespace App\Providers; use Illuminate\Http\Request; use App\Models\Database; +use Illuminate\Foundation\Http\Middleware\TrimStrings; use Illuminate\Support\Facades\Route; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Support\Facades\RateLimiter; -use App\Http\Middleware\TrimStrings; use App\Http\Middleware\AdminAuthenticate; use App\Http\Middleware\RequireTwoFactorAuthentication; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; diff --git a/bootstrap/app.php b/bootstrap/app.php index d5d7e70d2..bbdb24caf 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -14,7 +14,42 @@ return Application::configure(basePath: dirname(__DIR__)) health: '/up', ) ->withMiddleware(function (Middleware $middleware) { - // + $middleware->redirectGuestsTo(fn () => route('login')); + + $middleware->web(\App\Http\Middleware\LanguageMiddleware::class); + + $middleware->api([ + \App\Http\Middleware\EnsureStatefulRequests::class, + 'auth:sanctum', + \App\Http\Middleware\Api\IsValidJson::class, + \App\Http\Middleware\Activity\TrackAPIKey::class, + \App\Http\Middleware\RequireTwoFactorAuthentication::class, + \App\Http\Middleware\Api\AuthenticateIPAccess::class, + ]); + + $middleware->group('application-api', [ + \Illuminate\Routing\Middleware\SubstituteBindings::class, + \App\Http\Middleware\Api\Application\AuthenticateApplicationUser::class, + ]); + + $middleware->group('client-api', [ + \App\Http\Middleware\Api\Client\SubstituteClientBindings::class, + \App\Http\Middleware\Api\Client\RequireClientApiKey::class, + ]); + + $middleware->group('daemon', [ + \Illuminate\Routing\Middleware\SubstituteBindings::class, + \App\Http\Middleware\Api\Daemon\DaemonAuthenticate::class, + ]); + + $middleware->replaceInGroup('web', \Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class, \App\Http\Middleware\VerifyCsrfToken::class); + + $middleware->alias([ + 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, + 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'node.maintenance' => \App\Http\Middleware\MaintenanceMiddleware::class, + 'recaptcha' => \App\Http\Middleware\VerifyReCaptcha::class, + ]); }) ->withExceptions(function (Exceptions $exceptions) { // diff --git a/tests/Unit/Http/Middleware/RedirectIfAuthenticatedTest.php b/tests/Unit/Http/Middleware/RedirectIfAuthenticatedTest.php index 797779506..527448bbf 100644 --- a/tests/Unit/Http/Middleware/RedirectIfAuthenticatedTest.php +++ b/tests/Unit/Http/Middleware/RedirectIfAuthenticatedTest.php @@ -6,7 +6,7 @@ use Mockery as m; use Mockery\MockInterface; use Illuminate\Auth\AuthManager; use Illuminate\Http\RedirectResponse; -use App\Http\Middleware\RedirectIfAuthenticated; +use Illuminate\Auth\Middleware\RedirectIfAuthenticated; class RedirectIfAuthenticatedTest extends MiddlewareTestCase {