From f20bef6943ad436bbce922cbd90bc4cdb0544b8a Mon Sep 17 00:00:00 2001
From: Maicol Battistini <maicolbattistini@live.it>
Date: Sun, 2 Jul 2023 13:56:16 +0200
Subject: [PATCH] fix: Fix setup non funzionante

---
 app/Http/Controllers/Api/SetupController.php   |  9 +--------
 resources/ts/Views/Setup/SetupPage.tsx         |  8 ++++----
 resources/ts/Views/Setup/Steps/WelcomeStep.tsx |  4 ++--
 resources/views/app.blade.php                  |  5 +++--
 routes/api.php                                 | 16 ++++++++++------
 routes/web.php                                 |  9 +++++++--
 6 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/Api/SetupController.php b/app/Http/Controllers/Api/SetupController.php
index 3c4e450d8..e3cc04c53 100644
--- a/app/Http/Controllers/Api/SetupController.php
+++ b/app/Http/Controllers/Api/SetupController.php
@@ -73,15 +73,8 @@ class SetupController extends Controller
 
         // Identifying permissions granted to the user
         $database_name = Str::replace('_', '\_', $database_name);
-        /**
-         * @psalm-suppress InvalidArgument
-         *
-         * @noinspection PhpParamsInspection
-         *
-         * @phpstan-ignore-next-line
-         */
-        $grants = $connection->select($connection->raw('SHOW GRANTS FOR CURRENT_USER'));
 
+        $grants = $connection->select('SHOW GRANTS FOR CURRENT_USER');
         $requirements = [
             'SELECT',
             'INSERT',
diff --git a/resources/ts/Views/Setup/SetupPage.tsx b/resources/ts/Views/Setup/SetupPage.tsx
index b1ce45643..7e6d1aaaa 100644
--- a/resources/ts/Views/Setup/SetupPage.tsx
+++ b/resources/ts/Views/Setup/SetupPage.tsx
@@ -55,12 +55,12 @@ export default class SetupPage extends Page<SetupPageAttributes> {
 
     try {
       await Request.put(route('setup.save'), data);
+      void showSnackbar(__('Impostazioni salvate correttamente'));
+      router.visit(route('login'));
     } catch (error: any) {
+      // eslint-disable-next-line no-console
+      console.error(error);
       void showSnackbar((error as RequestError<{message: string}>).response.message);
-      return;
     }
-
-    void showSnackbar(__('Impostazioni salvate correttamente'));
-    router.visit(route('login'));
   }
 }
diff --git a/resources/ts/Views/Setup/Steps/WelcomeStep.tsx b/resources/ts/Views/Setup/Steps/WelcomeStep.tsx
index ee7a084e2..1ce5e410f 100644
--- a/resources/ts/Views/Setup/Steps/WelcomeStep.tsx
+++ b/resources/ts/Views/Setup/Steps/WelcomeStep.tsx
@@ -1,6 +1,6 @@
 import '@material/web/checkbox/checkbox.js';
 import '@material/web/field/outlined-field.js';
-import '@material/web/select/filled-select.js';
+import '@osm/Components/m3/FilledSelect';
 import '@material/web/select/select-option.js';
 
 import type {MdCheckbox} from '@material/web/checkbox/checkbox';
@@ -60,7 +60,7 @@ export default class WelcomeStep<A extends WelcomeStepAttributes = WelcomeStepAt
         </md-filled-select>
         <h4>{__('Licenza')}</h4>
         <p>{__('OpenSTAManager è tutelato dalla licenza GPL 3.0, da accettare obbligatoriamente per poter utilizzare il gestionale.')}</p>
-        <md-outlined-field populated style={{marginBottom: '8px'}}>
+        <md-outlined-field populated style={{marginBottom: '8px', '--md-outlined-field-container-padding-vertical': '0'}}>
           <p style={{
             overflow: 'auto', resize: 'both', height: '250px', fontFamily: 'monospace'
           }}>{this.attrs.get('license')}</p>
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 0e36a666d..8ff75544a 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -27,18 +27,19 @@
 @endphp
 
 @inertia
+
 <script>
   app = @js([
     'locale' => app()->getLocale(),
     'modules' => $modules,
-    'user' => auth()->user(),
+    'user' => Route::currentRouteName() !== 'setup.index' && auth()->user(),
     'VERSION' => trim(file_get_contents(base_path('VERSION'))),
     'REVISION' => trim(file_get_contents(base_path('REVISION'))),
     'settings' => [
         'date_format' => settings('date_format_long'),
         'date_format_short' => settings('date_format_short'),
         'time_format' => settings('time_format'),
-]
+    ]
 ]);
 </script>
 
diff --git a/routes/api.php b/routes/api.php
index 023be0f55..1e79aa1bd 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,6 +2,7 @@
 
 use App\Http\Controllers\Api\SetupController;
 use App\Http\Middleware\CheckConfigurationMiddleware;
+use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
 
 /*
 |--------------------------------------------------------------------------
@@ -14,12 +15,15 @@ use App\Http\Middleware\CheckConfigurationMiddleware;
 |
 */
 
-Route::name('setup.')->middleware(CheckConfigurationMiddleware::class)->group(static function () {
-    Route::post('setup/test', [SetupController::class, 'testDatabase'])
-        ->name('test');
+Route::name('setup.')
+    ->middleware(CheckConfigurationMiddleware::class)
+    ->withoutMiddleware([EnsureFrontendRequestsAreStateful::class])
+    ->group(static function () {
+        Route::post('setup/test', [SetupController::class, 'testDatabase'])
+            ->name('test');
 
-    Route::put('setup/save', [SetupController::class, 'save'])
-        ->name('save');
-});
+        Route::put('setup/save', [SetupController::class, 'save'])
+            ->name('save');
+    });
 
 Route::restifyAuth();
diff --git a/routes/web.php b/routes/web.php
index f6ac8ac2a..72c3c4c1c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,8 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\CheckConfigurationMiddleware;
+use App\Http\Middleware\LocaleMiddleware;
+use App\Http\Middleware\RedirectIfAuthenticated;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -16,7 +18,9 @@ use Illuminate\Support\Facades\Route;
 */
 
 Route::get('/', static fn () => redirect()->route('login'))
-    ->middleware(CheckConfigurationMiddleware::class);
+    ->middleware(CheckConfigurationMiddleware::class)
+    /** @psalm-suppress PossiblyInvalidMethodCall */
+    ->withoutMiddleware([LocaleMiddleware::class, RedirectIfAuthenticated::class]);
 
 Route::middleware('guest')->group(static function () {
     Route::inertia('login', 'LoginPage', ['external' => true])
@@ -32,7 +36,8 @@ Route::middleware('guest')->group(static function () {
         'license' => cache()->rememberForever('app.license', static fn () => file_get_contents(base_path('LICENSE'))),
         'external' => true,
     ])
-        ->middleware('guest', CheckConfigurationMiddleware::class)
+        ->middleware(CheckConfigurationMiddleware::class)
+        ->withoutMiddleware([LocaleMiddleware::class, RedirectIfAuthenticated::class])
         ->name('setup.index');
 });