Исправления "подсоса" токена из сессии
This commit is contained in:
@@ -51,6 +51,6 @@ class AuthController extends Controller
|
|||||||
|
|
||||||
$request->session()->put('token', $token);
|
$request->session()->put('token', $token);
|
||||||
|
|
||||||
return redirect()->intended(route('dashboard'));
|
return Inertia::location(route('start'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace App\Http\Middleware;
|
|||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
use Illuminate\Support\Facades\Session;
|
||||||
use Inertia\Middleware;
|
use Inertia\Middleware;
|
||||||
|
|
||||||
class HandleInertiaRequests extends Middleware
|
class HandleInertiaRequests extends Middleware
|
||||||
@@ -41,7 +42,7 @@ class HandleInertiaRequests extends Middleware
|
|||||||
...parent::share($request),
|
...parent::share($request),
|
||||||
'user' => $user ? [
|
'user' => $user ? [
|
||||||
'name' => $user->name,
|
'name' => $user->name,
|
||||||
'token' => $request->session()->get('token'),
|
'token' => Session::get('token'),
|
||||||
'permissions' => $user->permissions(),
|
'permissions' => $user->permissions(),
|
||||||
'available_departments' => $user->availableDepartments(),
|
'available_departments' => $user->availableDepartments(),
|
||||||
'current_department' => $user->department
|
'current_department' => $user->department
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ import {usePage} from "@inertiajs/vue3";
|
|||||||
|
|
||||||
export const useAuthStore = defineStore('authStore', () => {
|
export const useAuthStore = defineStore('authStore', () => {
|
||||||
const user = usePage().props.user
|
const user = usePage().props.user
|
||||||
const token = user.token
|
const token = user?.token
|
||||||
const permissions = user.permissions
|
const permissions = user?.permissions
|
||||||
const availableDepartments = ref([])
|
const availableDepartments = ref([])
|
||||||
|
|
||||||
// Инициализация axios с токеном
|
// Инициализация axios с токеном
|
||||||
if (token.value) {
|
if (token?.value) {
|
||||||
axios.defaults.headers.common['Authorization'] = `Bearer ${token.value}`
|
axios.defaults.headers.common['Authorization'] = `Bearer ${token.value}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,9 @@ Route::get('/statistic', [\App\Http\Controllers\Web\StatisticController::class,
|
|||||||
->middleware(['auth'])
|
->middleware(['auth'])
|
||||||
->name('statistic');
|
->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) {
|
Route::get('/test-session', function (\Illuminate\Http\Request $request) {
|
||||||
return [
|
return [
|
||||||
|
|||||||
Reference in New Issue
Block a user