Revert "Disabled request lifecycle middleware on public routes"

This reverts commit 658617c8bb.
This commit is contained in:
Julian Prieber 2023-07-22 13:16:28 +02:00
parent 4588ef9768
commit c5970309b4
3 changed files with 52 additions and 57 deletions

View File

@ -29,15 +29,13 @@ class Kernel extends HttpKernel
* @var array * @var array
*/ */
protected $middlewareGroups = [ protected $middlewareGroups = [
'AuthSession' => [ 'web' => [
\App\Http\Middleware\EncryptCookies::class, \App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class, \Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class, \App\Http\Middleware\VerifyCsrfToken::class,
],
'web' => [
\Illuminate\Routing\Middleware\SubstituteBindings::class, \Illuminate\Routing\Middleware\SubstituteBindings::class,
], ],
@ -45,7 +43,6 @@ class Kernel extends HttpKernel
'throttle:api', 'throttle:api',
\Illuminate\Routing\Middleware\SubstituteBindings::class, \Illuminate\Routing\Middleware\SubstituteBindings::class,
], ],
]; ];
/** /**

View File

@ -8,7 +8,6 @@ use App\Http\Controllers\Auth\NewPasswordController;
use App\Http\Controllers\Auth\PasswordResetLinkController; use App\Http\Controllers\Auth\PasswordResetLinkController;
use App\Http\Controllers\Auth\RegisteredUserController; use App\Http\Controllers\Auth\RegisteredUserController;
use App\Http\Controllers\Auth\VerifyEmailController; use App\Http\Controllers\Auth\VerifyEmailController;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
if(config('advanced-config.register_url') != '') { if(config('advanced-config.register_url') != '') {
@ -29,9 +28,7 @@ if (config('advanced-config.forgot_password_url') != '') {
$forgot_password = "/forgot-password"; $forgot_password = "/forgot-password";
} }
Route::middleware(['web', 'AuthSession'])->group(function () use ($register, $login, $forgot_password) { if(env('ALLOW_REGISTRATION') or $register !== '/register') {
if (env('ALLOW_REGISTRATION') || $register !== '/register') {
Route::get($register, [RegisteredUserController::class, 'create']) Route::get($register, [RegisteredUserController::class, 'create'])
->middleware('guest') ->middleware('guest')
->middleware('max.users') ->middleware('max.users')
@ -104,4 +101,4 @@ Route::middleware(['web', 'AuthSession'])->group(function () use ($register, $lo
return redirect(url('dashboard')); return redirect(url('dashboard'));
} }
})->name('blocked'); })->name('blocked');
});

View File

@ -96,7 +96,7 @@ Route::get('/vcard/{id?}', [UserController::class, 'vcard'])->name('vcard');
Route::get('/demo-page', [App\Http\Controllers\HomeController::class, 'demo'])->name('demo'); Route::get('/demo-page', [App\Http\Controllers\HomeController::class, 'demo'])->name('demo');
Route::middleware(['AuthSession', 'auth', 'blocked', 'impersonate'])->group(function () { Route::middleware(['auth', 'blocked', 'impersonate'])->group(function () {
//User route //User route
Route::group([ Route::group([
'middleware' => env('REGISTER_AUTH'), 'middleware' => env('REGISTER_AUTH'),
@ -141,10 +141,11 @@ Route::get('/studio/linkparamform_part/{typeid}/{linkid}', [LinkTypeViewControll
}); });
} }
Route::middleware(['AuthSession', 'auth', 'blocked', 'impersonate'])->group(function () {
//Social login route //Social login route
Route::get('/social-auth/{provider}/callback', [SocialLoginController::class, 'providerCallback']); Route::get('/social-auth/{provider}/callback', [SocialLoginController::class, 'providerCallback']);
Route::get('/social-auth/{provider}', [SocialLoginController::class, 'redirectToProvider'])->name('social.redirect'); Route::get('/social-auth/{provider}', [SocialLoginController::class, 'redirectToProvider'])->name('social.redirect');
Route::middleware(['auth', 'blocked', 'impersonate'])->group(function () {
//Admin route //Admin route
Route::group([ Route::group([
'middleware' => 'admin', 'middleware' => 'admin',