fix: sync CSS classes with refactored layout, restore missing sidebar items, add asset versioning, fix routes and auth
This commit is contained in:
@@ -400,6 +400,7 @@ class ApiController
|
||||
'error' => 'Command execution failed.',
|
||||
], 500);
|
||||
}
|
||||
}
|
||||
|
||||
public function users(): void
|
||||
{
|
||||
|
||||
@@ -67,6 +67,7 @@ class AuthController
|
||||
Session::set('username', $user['username']);
|
||||
Session::set('user_role', $user['role']);
|
||||
Session::set('user_email', $user['email']);
|
||||
Session::set('api_token', $user['api_token']);
|
||||
Session::set('login_time', time());
|
||||
|
||||
$lifetime = App::getConfig()['session']['lifetime'] ?? 1440;
|
||||
|
||||
@@ -47,6 +47,14 @@ if (!function_exists('asset')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('asset_version')) {
|
||||
function asset_version(): string
|
||||
{
|
||||
$config = \ServerManager\Core\App::getConfig();
|
||||
return $config['app']['asset_version'] ?? '0.0.0';
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('url')) {
|
||||
function url(string $path = ''): string
|
||||
{
|
||||
@@ -90,11 +98,23 @@ if (!function_exists('auth')) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$apiToken = \ServerManager\Core\Session::get('api_token');
|
||||
|
||||
if (empty($apiToken)) {
|
||||
$userModel = new \ServerManager\Models\User();
|
||||
$user = $userModel->findById((int) \ServerManager\Core\Session::get('user_id'));
|
||||
if ($user && !empty($user['api_token'])) {
|
||||
$apiToken = $user['api_token'];
|
||||
\ServerManager\Core\Session::set('api_token', $apiToken);
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'id' => \ServerManager\Core\Session::get('user_id'),
|
||||
'username' => \ServerManager\Core\Session::get('username'),
|
||||
'role' => \ServerManager\Core\Session::get('user_role'),
|
||||
'email' => \ServerManager\Core\Session::get('user_email'),
|
||||
'api_token' => $apiToken,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user