match inertia scaffolding with livewire in regards to authenticate se…

…ssion (#1003)
laravel · Mar 16, 2022 · 09130d4 · 09130d4
1 parent de8020c
commit 09130d4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 93 deletions.
diff --git a/routes/inertia.php b/routes/inertia.php
@@ -24,7 +24,11 @@
             ? 'auth:'.config('jetstream.guard')
             : 'auth';
 
-    Route::group(['middleware' => [$authMiddleware, 'verified']], function () {
+    $authSessionMiddleware = config('jetstream.authenticate_session', false)
+            ? config('jetstream.authenticate_session')
+            : null;
+
+    Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware, 'verified']))], function () {
         // User & Profile...
         Route::get('/user/profile', [UserProfileController::class, 'show'])
                     ->name('profile.show');

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -37,11 +37,6 @@ public function handle()
     {
         // Publish...
         $this->callSilent('vendor:publish', ['--tag' => 'jetstream-config', '--force' => true]);
-
-        if ($this->argument('stack') === 'livewire') {
-            copy(__DIR__.'/../../stubs/livewire/config/jetstream.php', config_path('jetstream.php'));
-        }
-
         $this->callSilent('vendor:publish', ['--tag' => 'jetstream-migrations', '--force' => true]);
 
         $this->callSilent('vendor:publish', ['--tag' => 'fortify-config', '--force' => true]);
@@ -347,13 +342,20 @@ protected function installInertiaStack()
 
         $this->installServiceProviderAfter('FortifyServiceProvider', 'JetstreamServiceProvider');
 
-        // AuthenticateSession Middleware...
+        // Remove AuthenticateSession Middleware...
         $this->replaceInFile(
-            '// \Illuminate\Session\Middleware\AuthenticateSession::class',
-            '\Laravel\Jetstream\Http\Middleware\AuthenticateSession::class',
+            PHP_EOL.'            // \Illuminate\Session\Middleware\AuthenticateSession::class,',
+            '',
             app_path('Http/Kernel.php')
         );
 
+        // AuthenticateSession Middleware...
+        // $this->replaceInFile(
+        //     '// \Illuminate\Session\Middleware\AuthenticateSession::class',
+        //     '\Laravel\Jetstream\Http\Middleware\AuthenticateSession::class',
+        //     app_path('Http/Kernel.php')
+        // );
+
         // Middleware...
         (new Process([$this->phpBinary(), 'artisan', 'inertia:middleware', 'HandleInertiaRequests', '--force'], base_path()))
             ->setTimeout(null)

diff --git a/stubs/config/jetstream.php b/stubs/config/jetstream.php
@@ -31,6 +31,8 @@
 
     'middleware' => ['web'],
 
+    'authenticate_session' => AuthenticateSession::class,
+
     /*
     |--------------------------------------------------------------------------
     | Jetstream Guard

diff --git a/stubs/inertia/routes/web.php b/stubs/inertia/routes/web.php
@@ -24,6 +24,12 @@
     ]);
 });
 
-Route::middleware(['auth:sanctum', 'verified'])->get('/dashboard', function () {
-    return Inertia::render('Dashboard');
-})->name('dashboard');
+Route::middleware([
+    'auth:sanctum',
+    config('jetstream.authenticate_session'),
+    'verified',
+])->group(function () {
+    Route::get('/dashboard', function () {
+        return Inertia::render('Dashboard');
+    })->name('dashboard');
+});
diff --git a/stubs/livewire/config/jetstream.php b/stubs/livewire/config/jetstream.php