Nodarx/server
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Projects Releases Activity

refactor(kernel): unify HTTP and CLI application lifecycle

Browse Source 
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
Sebastian Krupinski
2026-07-27 00:48:11 -04:00
parent 98826143a8
commit 65c1b5fb75
67 changed files with 2737 additions and 1070 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/lib/Controllers/DefaultController.php
+4 -4
View File
@@ -10,14 +10,14 @@ use KTXC\Http\Response\RedirectResponse;
use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AnonymousRoute;
use KTXC\Service\SecurityService;
use KTXC\SessionIdentity;
use KTXC\Context\IdentityContextInterface;
use KTXC\Http\Request\Request;
class DefaultController extends ControllerAbstract
{
public function __construct(
private readonly SecurityService $securityService,
private readonly SessionIdentity $identity,
private readonly IdentityContextInterface $identityContext,
#[Inject('rootDir')] private readonly string $rootDir,
) {}
@@ -25,7 +25,7 @@ class DefaultController extends ControllerAbstract
public function home(Request $request): Response
{
// If an authenticated identity is available, serve the private app
if ($this->identity->identifier()) {
if ($this->identityContext->identifier()) {
return new FileResponse(
$this->rootDir . '/public/private.html',
Response::HTTP_OK,
@@ -116,7 +116,7 @@ class DefaultController extends ControllerAbstract
public function catchAll(Request $request, string $path = ''): Response
{
// If an authenticated identity is available, serve the private app
if ($this->identity->identifier()) {
if ($this->identityContext->identifier()) {
return new FileResponse(
$this->rootDir . '/public/private.html',
Response::HTTP_OK,
core/lib/Controllers/InitController.php
+13 -13
View File
@@ -8,16 +8,16 @@ use KTXC\L10N\LocaleResolver;
use KTXC\Module\ModuleManager;
use KTXC\Security\Authorization\PermissionChecker;
use KTXC\Service\UserAccountsService;
use KTXC\SessionIdentity;
use KTXC\Context\IdentityContextInterface;
use KTXF\Controller\ControllerAbstract;
use KTXC\SessionTenant;
use KTXC\Context\TenantContextInterface;
use KTXF\Routing\Attributes\AuthenticatedRoute;
class InitController extends ControllerAbstract
{
public function __construct(
private readonly SessionTenant $tenant,
private readonly SessionIdentity $userIdentity,
private readonly TenantContextInterface $tenantContext,
private readonly IdentityContextInterface $identityContext,
private readonly ModuleManager $moduleManager,
private readonly UserAccountsService $userService,
private readonly PermissionChecker $permissionChecker,
@@ -54,21 +54,21 @@ class InitController extends ControllerAbstract
// tenant
$configuration['tenant'] = [
'id' => $this->tenant->identifier(),
'domain' => $this->tenant->domain(),
'label' => $this->tenant->label(),
'id' => $this->tenantContext->identifier(),
'domain' => $this->tenantContext->domain(),
'label' => $this->tenantContext->label(),
];
// user
$configuration['user'] = [
'auth' => [
'identifier' => $this->userIdentity->identifier(),
'identity' => $this->userIdentity->identity()->getIdentity(),
'label' => $this->userIdentity->label(),
'roles' => $this->userIdentity->identity()->getRoles(),
'permissions' => $this->userIdentity->identity()->getPermissions(),
'identifier' => $this->identityContext->identifier(),
'identity' => $this->identityContext->identity()->getIdentity(),
'label' => $this->identityContext->label(),
'roles' => $this->identityContext->identity()->getRoles(),
'permissions' => $this->identityContext->identity()->getPermissions(),
],
'profile' => $this->userService->getEditableFields($this->userIdentity->identifier()),
'profile' => $this->userService->getEditableFields($this->identityContext->identifier()),
'settings' => $this->userService->fetchSettings([], true),
];
core/lib/Controllers/TenantSettingsController.php
+5 -5
View File
@@ -4,7 +4,7 @@ namespace KTXC\Controllers;
use KTXC\Http\Response\JsonResponse;
use KTXC\Service\TenantService;
use KTXC\SessionTenant;
use KTXC\Context\TenantContextInterface;
use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute;
@@ -19,7 +19,7 @@ use KTXF\Routing\Attributes\AuthenticatedRoute;
class TenantSettingsController extends ControllerAbstract
{
public function __construct(
private readonly SessionTenant $tenantIdentity,
private readonly TenantContextInterface $tenantContext,
private readonly TenantService $tenantService,
) {}
@@ -36,7 +36,7 @@ class TenantSettingsController extends ControllerAbstract
)]
public function read(): JsonResponse
{
$settings = $this->tenantService->fetchSettings($this->tenantIdentity->identifier());
$settings = $this->tenantService->fetchSettings($this->tenantContext->identifier());
return new JsonResponse($settings, JsonResponse::HTTP_OK);
}
@@ -65,9 +65,9 @@ class TenantSettingsController extends ControllerAbstract
)]
public function update(array $data): JsonResponse
{
$this->tenantService->storeSettings($this->tenantIdentity->identifier(), $data);
$this->tenantService->storeSettings($this->tenantContext->identifier(), $data);
$updatedSettings = $this->tenantService->fetchSettings($this->tenantIdentity->identifier(), array_keys($data));
$updatedSettings = $this->tenantService->fetchSettings($this->tenantContext->identifier(), array_keys($data));
return new JsonResponse($updatedSettings, JsonResponse::HTTP_OK);
}
core/lib/Controllers/UserAccountsController.php
+18 -18
View File
@@ -4,8 +4,8 @@ namespace KTXC\Controllers;
use KTXC\Http\Response\JsonResponse;
use KTXC\Service\UserAccountsService;
use KTXC\SessionIdentity;
use KTXC\SessionTenant;
use KTXC\Context\IdentityContextInterface;
use KTXC\Context\TenantContextInterface;
use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute;
use Psr\Log\LoggerInterface;
@@ -17,8 +17,8 @@ use Psr\Log\LoggerInterface;
class UserAccountsController extends ControllerAbstract
{
public function __construct(
private readonly SessionTenant $tenantIdentity,
private readonly SessionIdentity $userIdentity,
private readonly TenantContextInterface $tenantContext,
private readonly IdentityContextInterface $identityContext,
private readonly UserAccountsService $userService,
private readonly LoggerInterface $logger
) {}
@@ -31,7 +31,7 @@ class UserAccountsController extends ControllerAbstract
{
try {
// Check admin permission
if (!$this->userIdentity->hasPermission('user.admin')) {
if (!$this->identityContext->hasPermission('user.admin')) {
return new JsonResponse([
'status' => 'error',
'data' => ['code' => 403, 'message' => 'Insufficient permissions']
@@ -125,7 +125,7 @@ class UserAccountsController extends ControllerAbstract
*/
private function userCreate(array $data): array
{
if (!$this->userIdentity->hasPermission('user.create')) {
if (!$this->identityContext->hasPermission('user.create')) {
throw new \InvalidArgumentException('Insufficient permissions to create users');
}
@@ -142,9 +142,9 @@ class UserAccountsController extends ControllerAbstract
];
$this->logger->info('Creating user', [
'tenant' => $this->tenantIdentity->identifier(),
'tenant' => $this->tenantContext->identifier(),
'identity' => $userData['identity'],
'actor' => $this->userIdentity->identifier()
'actor' => $this->identityContext->identifier()
]);
return $this->userService->createUser($userData);
@@ -155,7 +155,7 @@ class UserAccountsController extends ControllerAbstract
*/
private function userUpdate(array $data): bool
{
if (!$this->userIdentity->hasPermission('user.update')) {
if (!$this->identityContext->hasPermission('user.update')) {
throw new \InvalidArgumentException('Insufficient permissions to update users');
}
@@ -186,9 +186,9 @@ class UserAccountsController extends ControllerAbstract
}
$this->logger->info('Updating user', [
'tenant' => $this->tenantIdentity->identifier(),
'tenant' => $this->tenantContext->identifier(),
'uid' => $uid,
'actor' => $this->userIdentity->identifier()
'actor' => $this->identityContext->identifier()
]);
return $this->userService->updateUser($uid, $updates);
@@ -199,21 +199,21 @@ class UserAccountsController extends ControllerAbstract
*/
private function userDelete(array $data): bool
{
if (!$this->userIdentity->hasPermission('user.delete')) {
if (!$this->identityContext->hasPermission('user.delete')) {
throw new \InvalidArgumentException('Insufficient permissions to delete users');
}
$uid = $data['uid'] ?? throw new \InvalidArgumentException('User ID required');
// Prevent self-deletion
if ($uid === $this->userIdentity->identifier()) {
if ($uid === $this->identityContext->identifier()) {
throw new \InvalidArgumentException('Cannot delete your own account');
}
$this->logger->info('Deleting user', [
'tenant' => $this->tenantIdentity->identifier(),
'tenant' => $this->tenantContext->identifier(),
'uid' => $uid,
'actor' => $this->userIdentity->identifier()
'actor' => $this->identityContext->identifier()
]);
return $this->userService->deleteUser($uid);
@@ -228,7 +228,7 @@ class UserAccountsController extends ControllerAbstract
*/
private function userProviderUnlink(array $data): bool
{
if (!$this->userIdentity->hasPermission('user.admin')) {
if (!$this->identityContext->hasPermission('user.admin')) {
throw new \InvalidArgumentException('Insufficient permissions');
}
@@ -241,9 +241,9 @@ class UserAccountsController extends ControllerAbstract
];
$this->logger->info('Unlinking provider', [
'tenant' => $this->tenantIdentity->identifier(),
'tenant' => $this->tenantContext->identifier(),
'uid' => $uid,
'actor' => $this->userIdentity->identifier()
'actor' => $this->identityContext->identifier()
]);
return $this->userService->updateUser($uid, $updates);
core/lib/Controllers/UserProfileController.php
+6 -6
View File
@@ -4,16 +4,16 @@ namespace KTXC\Controllers;
use KTXC\Http\Response\JsonResponse;
use KTXC\Service\UserAccountsService;
use KTXC\SessionIdentity;
use KTXC\SessionTenant;
use KTXC\Context\IdentityContextInterface;
use KTXC\Context\TenantContextInterface;
use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute;
class UserProfileController extends ControllerAbstract
{
public function __construct(
private readonly SessionTenant $tenantIdentity,
private readonly SessionIdentity $userIdentity,
private readonly TenantContextInterface $tenantContext,
private readonly IdentityContextInterface $identityContext,
private readonly UserAccountsService $userService
) {}
@@ -30,7 +30,7 @@ class UserProfileController extends ControllerAbstract
)]
public function read(): JsonResponse
{
$userId = $this->userIdentity->identifier();
$userId = $this->identityContext->identifier();
// Get profile with editability metadata
$profile = $this->userService->getEditableFields($userId);
@@ -63,7 +63,7 @@ class UserProfileController extends ControllerAbstract
)]
public function update(array $data): JsonResponse
{
$userId = $this->userIdentity->identifier();
$userId = $this->identityContext->identifier();
// storeProfile automatically filters out provider-managed fields
$this->userService->storeProfile($userId, $data);
core/lib/Controllers/UserRolesController.php
+8 -8
View File
@@ -3,8 +3,8 @@
namespace KTXC\Controllers;
use KTXC\Http\Response\JsonResponse;
use KTXC\SessionIdentity;
use KTXC\SessionTenant;
use KTXC\Context\IdentityContextInterface;
use KTXC\Context\TenantContextInterface;
use KTXC\Service\UserRolesService;
use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute;
@@ -17,8 +17,8 @@ use Psr\Log\LoggerInterface;
class UserRolesController extends ControllerAbstract
{
public function __construct(
private readonly SessionTenant $tenantIdentity,
private readonly SessionIdentity $userIdentity,
private readonly TenantContextInterface $tenantContext,
private readonly IdentityContextInterface $identityContext,
private readonly UserRolesService $roleService,
private readonly LoggerInterface $logger
) {}
@@ -31,7 +31,7 @@ class UserRolesController extends ControllerAbstract
{
try {
// Check role admin permission
if (!$this->userIdentity->hasPermission('role.admin')) {
if (!$this->identityContext->hasPermission('role.admin')) {
return new JsonResponse([
'status' => 'error',
'data' => ['code' => 403, 'message' => 'Insufficient permissions']
@@ -137,7 +137,7 @@ class UserRolesController extends ControllerAbstract
*/
private function roleCreate(array $data): array
{
if (!$this->userIdentity->hasPermission('role.manage')) {
if (!$this->identityContext->hasPermission('role.manage')) {
throw new \InvalidArgumentException('Insufficient permissions to create roles');
}
@@ -155,7 +155,7 @@ class UserRolesController extends ControllerAbstract
*/
private function roleUpdate(array $data): bool
{
if (!$this->userIdentity->hasPermission('role.manage')) {
if (!$this->identityContext->hasPermission('role.manage')) {
throw new \InvalidArgumentException('Insufficient permissions to update roles');
}
@@ -182,7 +182,7 @@ class UserRolesController extends ControllerAbstract
*/
private function roleDelete(array $data): bool
{
if (!$this->userIdentity->hasPermission('role.manage')) {
if (!$this->identityContext->hasPermission('role.manage')) {
throw new \InvalidArgumentException('Insufficient permissions to delete roles');
}
core/lib/Controllers/UserSettingsController.php
+4 -4
View File
@@ -5,16 +5,16 @@ namespace KTXC\Controllers;
use KTXC\Http\Request\Request;
use KTXC\Http\Response\JsonResponse;
use KTXC\Service\UserAccountsService;
use KTXC\SessionIdentity;
use KTXC\SessionTenant;
use KTXC\Context\IdentityContextInterface;
use KTXC\Context\TenantContextInterface;
use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute;
class UserSettingsController extends ControllerAbstract
{
public function __construct(
private readonly SessionTenant $tenantIdentity,
private readonly SessionIdentity $userIdentity,
private readonly TenantContextInterface $tenantContext,
private readonly IdentityContextInterface $identityContext,
private readonly UserAccountsService $userService
) {}