diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 7f8fe54..08e99ba 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -51,6 +51,6 @@ class AuthController extends Controller $request->session()->put('token', $token); - return redirect()->intended(route('dashboard')); + return Inertia::location(route('start')); } } diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index e9b6fcf..cc417e6 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -4,6 +4,7 @@ namespace App\Http\Middleware; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Session; use Inertia\Middleware; class HandleInertiaRequests extends Middleware @@ -41,7 +42,7 @@ class HandleInertiaRequests extends Middleware ...parent::share($request), 'user' => $user ? [ 'name' => $user->name, - 'token' => $request->session()->get('token'), + 'token' => Session::get('token'), 'permissions' => $user->permissions(), 'available_departments' => $user->availableDepartments(), 'current_department' => $user->department diff --git a/resources/js/Stores/auth.js b/resources/js/Stores/auth.js index 24bf756..53bccb0 100644 --- a/resources/js/Stores/auth.js +++ b/resources/js/Stores/auth.js @@ -5,12 +5,12 @@ import {usePage} from "@inertiajs/vue3"; export const useAuthStore = defineStore('authStore', () => { const user = usePage().props.user - const token = user.token - const permissions = user.permissions + const token = user?.token + const permissions = user?.permissions const availableDepartments = ref([]) // Инициализация axios с токеном - if (token.value) { + if (token?.value) { axios.defaults.headers.common['Authorization'] = `Bearer ${token.value}` } diff --git a/routes/web.php b/routes/web.php index 3a3c096..52632e8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -25,7 +25,9 @@ Route::get('/statistic', [\App\Http\Controllers\Web\StatisticController::class, ->middleware(['auth']) ->name('statistic'); -Route::get('/', [\App\Http\Controllers\Web\IndexController::class, 'start']); +Route::get('/', [\App\Http\Controllers\Web\IndexController::class, 'start']) + ->middleware(['auth']) + ->name('start'); Route::get('/test-session', function (\Illuminate\Http\Request $request) { return [