Skip to content

Commit 4d3362b

Browse files
committed
Perform a bit of code cleanup
1 parent be88e4e commit 4d3362b

File tree

6 files changed

+6
-82
lines changed

6 files changed

+6
-82
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ public function login(Request $request): JsonResponse
8686

8787
$this->auth->guard()->login($user, true);
8888

89+
$request->session()->regenerate();
90+
8991
return $this->sendLoginResponse($user, $request);
9092
}
9193
}

app/Http/Kernel.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Pterodactyl\Http\Middleware\Api\IsValidJson;
1212
use Pterodactyl\Http\Middleware\VerifyCsrfToken;
1313
use Pterodactyl\Http\Middleware\VerifyReCaptcha;
14-
use Pterodactyl\Http\Middleware\AdminAuthenticate;
1514
use Illuminate\Routing\Middleware\ThrottleRequests;
1615
use Pterodactyl\Http\Middleware\LanguageMiddleware;
1716
use Illuminate\Foundation\Http\Kernel as HttpKernel;
@@ -65,9 +64,9 @@ class Kernel extends HttpKernel
6564
RequireTwoFactorAuthentication::class,
6665
],
6766
'api' => [
68-
IsValidJson::class,
6967
EnsureStatefulRequests::class,
7068
'auth:sanctum',
69+
IsValidJson::class,
7170
RequireTwoFactorAuthentication::class,
7271
AuthenticateIPAccess::class,
7372
],
@@ -93,7 +92,6 @@ class Kernel extends HttpKernel
9392
'auth' => Authenticate::class,
9493
'auth.basic' => AuthenticateWithBasicAuth::class,
9594
'guest' => RedirectIfAuthenticated::class,
96-
'admin' => AdminAuthenticate::class,
9795
'csrf' => VerifyCsrfToken::class,
9896
'throttle' => ThrottleRequests::class,
9997
'can' => Authorize::class,

app/Http/Middleware/Authenticate.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/Providers/RouteServiceProvider.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Cache\RateLimiting\Limit;
99
use Illuminate\Support\Facades\RateLimiter;
1010
use Pterodactyl\Http\Middleware\TrimStrings;
11+
use Pterodactyl\Http\Middleware\AdminAuthenticate;
1112
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
1213

1314
class RouteServiceProvider extends ServiceProvider
@@ -33,10 +34,10 @@ public function boot()
3334
Route::model('database', Database::class);
3435

3536
$this->routes(function () {
36-
Route::middleware(['web', 'csrf'])->group(function () {
37+
Route::middleware('web')->group(function () {
3738
Route::middleware('auth')->group(base_path('routes/base.php'));
3839
Route::middleware('guest')->prefix('/auth')->group(base_path('routes/auth.php'));
39-
Route::middleware(['auth', 'admin'])->prefix('/admin')->group(base_path('routes/admin.php'));
40+
Route::middleware(['auth', AdminAuthenticate::class])->prefix('/admin')->group(base_path('routes/admin.php'));
4041
});
4142

4243
Route::middleware('api')->group(function () {

resources/scripts/api/http.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ const http: AxiosInstance = axios.create({
1111
},
1212
});
1313

14-
http.interceptors.request.use(req => {
15-
const cookies = document.cookie.split(';').reduce((obj, val) => {
16-
const [ key, value ] = val.trim().split('=').map(decodeURIComponent);
17-
18-
return { ...obj, [key]: value };
19-
}, {} as Record<string, string>);
20-
21-
req.headers['X-XSRF-TOKEN'] = cookies['XSRF-TOKEN'] || 'nil';
22-
23-
return req;
24-
});
25-
2614
http.interceptors.request.use(req => {
2715
if (!req.url?.endsWith('/resources')) {
2816
store.getActions().progress.startContinuous();

tests/Unit/Http/Middleware/AuthenticateTest.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)