Skip to content

Commit e9aecfe

Browse files
committed
Shorten imports
1 parent 79decaf commit e9aecfe

File tree

1 file changed

+42
-24
lines changed

1 file changed

+42
-24
lines changed

app/Http/Kernel.php

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,32 @@
22

33
namespace Pterodactyl\Http;
44

5+
use Fideloper\Proxy\TrustProxies;
6+
use Illuminate\Auth\Middleware\Authorize;
7+
use Illuminate\Auth\Middleware\Authenticate;
8+
use Pterodactyl\Http\Middleware\TrimStrings;
9+
use Illuminate\Session\Middleware\StartSession;
10+
use Pterodactyl\Http\Middleware\EncryptCookies;
11+
use Pterodactyl\Http\Middleware\VerifyCsrfToken;
12+
use Pterodactyl\Http\Middleware\VerifyReCaptcha;
13+
use Pterodactyl\Http\Middleware\AdminAuthenticate;
14+
use Pterodactyl\Http\Middleware\HMACAuthorization;
15+
use Illuminate\Routing\Middleware\ThrottleRequests;
516
use Pterodactyl\Http\Middleware\DaemonAuthenticate;
17+
use Pterodactyl\Http\Middleware\LanguageMiddleware;
618
use Illuminate\Foundation\Http\Kernel as HttpKernel;
719
use Illuminate\Routing\Middleware\SubstituteBindings;
820
use Pterodactyl\Http\Middleware\AccessingValidServer;
21+
use Illuminate\View\Middleware\ShareErrorsFromSession;
22+
use Pterodactyl\Http\Middleware\RedirectIfAuthenticated;
23+
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
24+
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
925
use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
1026
use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer;
27+
use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
1128
use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
1229
use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
30+
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
1331

1432
class Kernel extends HttpKernel
1533
{
@@ -19,15 +37,15 @@ class Kernel extends HttpKernel
1937
* @var array
2038
*/
2139
protected $middleware = [
22-
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
23-
\Pterodactyl\Http\Middleware\EncryptCookies::class,
24-
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
25-
\Pterodactyl\Http\Middleware\TrimStrings::class,
40+
CheckForMaintenanceMode::class,
41+
EncryptCookies::class,
42+
AddQueuedCookiesToResponse::class,
43+
TrimStrings::class,
2644

2745
/*
2846
* Custom middleware applied to all routes.
2947
*/
30-
\Fideloper\Proxy\TrustProxies::class,
48+
TrustProxies::class,
3149
];
3250

3351
/**
@@ -37,23 +55,23 @@ class Kernel extends HttpKernel
3755
*/
3856
protected $middlewareGroups = [
3957
'web' => [
40-
\Pterodactyl\Http\Middleware\EncryptCookies::class,
41-
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
42-
\Illuminate\Session\Middleware\StartSession::class,
43-
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
44-
\Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
45-
\Illuminate\Routing\Middleware\SubstituteBindings::class,
46-
\Pterodactyl\Http\Middleware\LanguageMiddleware::class,
47-
\Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication::class,
58+
EncryptCookies::class,
59+
AddQueuedCookiesToResponse::class,
60+
StartSession::class,
61+
ShareErrorsFromSession::class,
62+
VerifyCsrfToken::class,
63+
SubstituteBindings::class,
64+
LanguageMiddleware::class,
65+
RequireTwoFactorAuthentication::class,
4866
],
4967
'api' => [
50-
\Pterodactyl\Http\Middleware\HMACAuthorization::class,
68+
HMACAuthorization::class,
5169
'throttle:60,1',
5270
'bindings',
5371
],
5472
'daemon' => [
55-
\Pterodactyl\Http\Middleware\Daemon\DaemonAuthenticate::class,
5673
SubstituteBindings::class,
74+
'daemon-old',
5775
],
5876
];
5977

@@ -63,18 +81,18 @@ class Kernel extends HttpKernel
6381
* @var array
6482
*/
6583
protected $routeMiddleware = [
66-
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
67-
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
68-
'guest' => \Pterodactyl\Http\Middleware\RedirectIfAuthenticated::class,
84+
'auth' => Authenticate::class,
85+
'auth.basic' => AuthenticateWithBasicAuth::class,
86+
'guest' => RedirectIfAuthenticated::class,
6987
'server' => AccessingValidServer::class,
7088
'subuser.auth' => AuthenticateAsSubuser::class,
71-
'admin' => \Pterodactyl\Http\Middleware\AdminAuthenticate::class,
89+
'admin' => AdminAuthenticate::class,
7290
'daemon-old' => DaemonAuthenticate::class,
73-
'csrf' => \Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
74-
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
75-
'can' => \Illuminate\Auth\Middleware\Authorize::class,
76-
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
77-
'recaptcha' => \Pterodactyl\Http\Middleware\VerifyReCaptcha::class,
91+
'csrf' => VerifyCsrfToken::class,
92+
'throttle' => ThrottleRequests::class,
93+
'can' => Authorize::class,
94+
'bindings' => SubstituteBindings::class,
95+
'recaptcha' => VerifyReCaptcha::class,
7896

7997
// Server specific middleware (used for authenticating access to resources)
8098
//

0 commit comments

Comments
 (0)