refactor(kernel): unify HTTP and CLI application lifecycle
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
@@ -5,7 +5,10 @@ namespace KTXC\Http\Middleware;
|
||||
use KTXC\Http\Request\Request;
|
||||
use KTXC\Http\Response\Response;
|
||||
use KTXC\Service\SecurityService;
|
||||
use KTXC\SessionIdentity;
|
||||
use KTXC\Context\IdentityContext;
|
||||
use KTXF\Cache\BlobCacheInterface;
|
||||
use KTXF\Cache\EphemeralCacheInterface;
|
||||
use KTXF\Cache\PersistentCacheInterface;
|
||||
|
||||
/**
|
||||
* Authentication middleware
|
||||
@@ -19,7 +22,10 @@ class AuthenticationMiddleware implements MiddlewareInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly SecurityService $securityService,
|
||||
private readonly SessionIdentity $sessionIdentity
|
||||
private readonly IdentityContext $identityContext,
|
||||
private readonly EphemeralCacheInterface $ephemeralCache,
|
||||
private readonly PersistentCacheInterface $persistentCache,
|
||||
private readonly BlobCacheInterface $blobCache,
|
||||
) {}
|
||||
|
||||
public function process(Request $request, RequestHandlerInterface $handler): Response
|
||||
@@ -29,7 +35,11 @@ class AuthenticationMiddleware implements MiddlewareInterface
|
||||
|
||||
// Initialize session identity if authentication succeeded
|
||||
if ($identity) {
|
||||
$this->sessionIdentity->initialize($identity, true);
|
||||
$this->identityContext->initialize($identity);
|
||||
$identityId = $this->identityContext->identifier();
|
||||
$this->ephemeralCache->setUserContext($identityId);
|
||||
$this->persistentCache->setUserContext($identityId);
|
||||
$this->blobCache->setUserContext($identityId);
|
||||
}
|
||||
|
||||
// Continue to next middleware (authentication is optional at this stage)
|
||||
|
||||
@@ -6,7 +6,7 @@ use KTXC\Http\Request\Request;
|
||||
use KTXC\Http\Response\Response;
|
||||
use KTXC\Routing\Router;
|
||||
use KTXC\Routing\Route;
|
||||
use KTXC\SessionIdentity;
|
||||
use KTXC\Context\IdentityContextInterface;
|
||||
use KTXC\Security\Authorization\PermissionChecker;
|
||||
|
||||
/**
|
||||
@@ -17,7 +17,7 @@ class RouterMiddleware implements MiddlewareInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly Router $router,
|
||||
private readonly SessionIdentity $sessionIdentity,
|
||||
private readonly IdentityContextInterface $identityContext,
|
||||
private readonly PermissionChecker $permissionChecker
|
||||
) {}
|
||||
|
||||
@@ -32,7 +32,7 @@ class RouterMiddleware implements MiddlewareInterface
|
||||
}
|
||||
|
||||
// Check if route requires authentication
|
||||
if ($match->authenticated && $this->sessionIdentity->identity() === null) {
|
||||
if ($match->authenticated && $this->identityContext->identity() === null) {
|
||||
return new Response(
|
||||
Response::$statusTexts[Response::HTTP_UNAUTHORIZED],
|
||||
Response::HTTP_UNAUTHORIZED
|
||||
|
||||
@@ -4,7 +4,10 @@ namespace KTXC\Http\Middleware;
|
||||
|
||||
use KTXC\Http\Request\Request;
|
||||
use KTXC\Http\Response\Response;
|
||||
use KTXC\SessionTenant;
|
||||
use KTXC\Context\TenantContext;
|
||||
use KTXF\Cache\BlobCacheInterface;
|
||||
use KTXF\Cache\EphemeralCacheInterface;
|
||||
use KTXF\Cache\PersistentCacheInterface;
|
||||
|
||||
/**
|
||||
* Tenant resolution middleware
|
||||
@@ -13,16 +16,23 @@ use KTXC\SessionTenant;
|
||||
class TenantMiddleware implements MiddlewareInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly SessionTenant $sessionTenant
|
||||
private readonly TenantContext $tenantContext,
|
||||
private readonly EphemeralCacheInterface $ephemeralCache,
|
||||
private readonly PersistentCacheInterface $persistentCache,
|
||||
private readonly BlobCacheInterface $blobCache,
|
||||
) {}
|
||||
|
||||
public function process(Request $request, RequestHandlerInterface $handler): Response
|
||||
{
|
||||
// Configure tenant from request host
|
||||
$this->sessionTenant->configure($request->getHost());
|
||||
$this->tenantContext->resolveDomain($request->getHost());
|
||||
$tenantId = $this->tenantContext->identifier();
|
||||
$this->ephemeralCache->setTenantContext($tenantId);
|
||||
$this->persistentCache->setTenantContext($tenantId);
|
||||
$this->blobCache->setTenantContext($tenantId);
|
||||
|
||||
// Check if tenant is configured and enabled
|
||||
if (!$this->sessionTenant->configured() || !$this->sessionTenant->enabled()) {
|
||||
if (!$this->tenantContext->configured() || !$this->tenantContext->enabled()) {
|
||||
return new Response(
|
||||
Response::$statusTexts[Response::HTTP_UNAUTHORIZED],
|
||||
Response::HTTP_UNAUTHORIZED
|
||||
|
||||
Reference in New Issue
Block a user