refactor(http): split session configs by manager

Author: innocenzi

packages/core/src/AppConfig.php

@@ -13,6 +13,8 @@ final class AppConfig
     public string $baseUri;
 
     public function __construct(
+        public ?string $name = null,
+
         ?Environment $environment = null,
 
         ?string $baseUri = null,
@@ -26,7 +28,6 @@ public function __construct(
         public array $insightsProviders = [],
     ) {
         $this->environment = $environment ?? Environment::fromEnv();
-
         $this->baseUri = $baseUri ?? env('BASE_URI') ?? '';
     }
 }

packages/core/src/Config/app.config.php

@@ -4,4 +4,9 @@
 
 use Tempest\Core\AppConfig;
 
-return new AppConfig();
+use function Tempest\env;
+
+return new AppConfig(
+    name: env('APPLICATION_NAME'),
+    baseUri: env('BASE_URI'),
+);

packages/http/src/Session/CleanupSessionsCommand.php

@@ -8,6 +8,7 @@
 use Tempest\Console\ConsoleCommand;
 use Tempest\Console\Schedule;
 use Tempest\Console\Scheduler\Every;
+use Tempest\EventBus\EventBus;
 
 use function Tempest\listen;
 

packages/http/src/Session/Config/FileSessionConfig.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Tempest\Http\Session\Config;
+
+use Tempest\Container\Container;
+use Tempest\Http\Session\Managers\FileSessionManager;
+use Tempest\Http\Session\Resolvers\CookieSessionIdResolver;
+use Tempest\Http\Session\SessionConfig;
+
+final class FileSessionConfig implements SessionConfig
+{
+    public function __construct(
+        /**
+         * Path to the sessions storage directory, relative to the internal storage.
+         */
+        public string $path,
+
+        public int $expirationInSeconds = 60 * 60 * 24 * 30,
+
+        public string $idResolverClass = CookieSessionIdResolver::class,
+    ) {}
+
+    public function createManager(Container $container): FileSessionManager
+    {
+        return $container->get(FileSessionManager::class);
+    }
+}

packages/http/src/Session/Config/session.config.php

@@ -0,0 +1,7 @@
+<?php
+
+use Tempest\Http\Session\Config\FileSessionConfig;
+
+return new FileSessionConfig(
+    path: 'sessions',
+);

packages/http/src/Session/Resolvers/CookieSessionIdResolver.php

@@ -6,29 +6,37 @@
 
 use Symfony\Component\Uid\Uuid;
 use Tempest\Clock\Clock;
+use Tempest\Core\AppConfig;
 use Tempest\Http\Cookie\CookieManager;
-use Tempest\Http\Session\Session;
 use Tempest\Http\Session\SessionConfig;
 use Tempest\Http\Session\SessionId;
 use Tempest\Http\Session\SessionIdResolver;
 
+use function Tempest\Support\str;
+
 final readonly class CookieSessionIdResolver implements SessionIdResolver
 {
     public function __construct(
+        private AppConfig $appConfig,
         private CookieManager $cookies,
         private SessionConfig $sessionConfig,
         private Clock $clock,
     ) {}
 
     public function resolve(): SessionId
     {
-        $id = $this->cookies->get(Session::ID)->value ?? null;
+        $sessionId = str($this->appConfig->name ?? 'tempest')
+            ->snake()
+            ->append('_session_id')
+            ->toString();
+
+        $id = $this->cookies->get($sessionId)->value ?? null;
 
         if (! $id) {
             $id = (string) Uuid::v4();
 
             $this->cookies->set(
-                key: Session::ID,
+                key: $sessionId,
                 value: $id,
                 expiresAt: $this->clock->now()->plusSeconds($this->sessionConfig->expirationInSeconds),
             );

packages/http/src/Session/Resolvers/HeaderSessionIdResolver.php

@@ -5,21 +5,27 @@
 namespace Tempest\Http\Session\Resolvers;
 
 use Symfony\Component\Uid\Uuid;
+use Tempest\Core\AppConfig;
 use Tempest\Http\Request;
-use Tempest\Http\Session\Session;
 use Tempest\Http\Session\SessionId;
 use Tempest\Http\Session\SessionIdResolver;
 
 final readonly class HeaderSessionIdResolver implements SessionIdResolver
 {
     public function __construct(
+        private AppConfig $appConfig,
         private Request $request,
     ) {}
 
     public function resolve(): SessionId
     {
-        $id = $this->request->headers[Session::ID] ?? null;
+        $sessionId = str($this->appConfig->name ?? 'tempest')
+            ->snake()
+            ->append('_session_id')
+            ->toString();
 
-        return new SessionId($id ?? ((string) Uuid::v4()));
+        return new SessionId(
+            id: $this->request->headers[$sessionId] ?? Uuid::v4()->toString(),
+        );
     }
 }

packages/http/src/Session/Session.php

@@ -10,8 +10,6 @@
 
 final class Session
 {
-    public const string ID = 'tempest_session_id';
-
     public const string VALIDATION_ERRORS = 'validation_errors';
 
     public const string ORIGINAL_VALUES = 'original_values';

packages/http/src/Session/SessionConfig.php

@@ -1,35 +1,26 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Tempest\Http\Session;
 
-use Tempest\Http\Session\Managers\FileSessionManager;
-use Tempest\Http\Session\Resolvers\CookieSessionIdResolver;
+use Tempest\Container\Container;
+use Tempest\Http\Session\SessionIdResolver;
 
-final class SessionConfig
+interface SessionConfig
 {
-    public function __construct(
-        /**
-         * Path to the sessions storage directory, relative to the internal storage.
-         */
-        public string $path = 'sessions',
-
-        /**
-         * Time required for a session to expire. Defaults to one month.
-         */
-        public int $expirationInSeconds = 60 * 60 * 24 * 30,
+    /**
+     * Time required for a session to expire. Defaults to one month.
+     */
+    public int $expirationInSeconds {
+        get;
+    }
 
-        /**
-         * @template SessionManager of \Tempest\Http\Session\SessionManager
-         * @var class-string<SessionManager>
-         */
-        public string $managerClass = FileSessionManager::class,
+    /**
+     * @template SessionIdResolver of \Tempest\Http\Session\SessionIdResolver
+     * @var class-string<SessionIdResolver>
+     */
+    public string $idResolverClass {
+        get;
+    }
 
-        /**
-         * @template SessionIdResolver of \Tempest\Http\Session\SessionIdResolver
-         * @var class-string<SessionIdResolver>
-         */
-        public string $idResolverClass = CookieSessionIdResolver::class,
-    ) {}
+    public function createManager(Container $container): SessionManager;
 }

packages/http/src/Session/SessionIdResolverInitializer.php

@@ -6,6 +6,7 @@
 
 use Tempest\Container\Container;
 use Tempest\Container\Initializer;
+use Tempest\Http\Session\SessionConfig;
 
 final readonly class SessionIdResolverInitializer implements Initializer
 {