feat: listen to user life cycle events

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>

lib/Console/ConnectCommand.php

@@ -13,7 +13,7 @@ use KTXM\ProviderImap\Providers\Provider;
 use KTXM\ProviderImap\Providers\Service;
 use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
 use KTXM\ProviderImap\Providers\ServiceLocation;
-use KTXC\SessionTenant;
+use KTXC\Context\TenantContext;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -41,7 +41,7 @@ class ConnectCommand extends Command
 {
     public function __construct(
         private readonly Provider      $provider,
-        private readonly SessionTenant $sessionTenant,
+        private readonly TenantContext $tenantContext,
     ) {
         parent::__construct();
     }
@@ -186,7 +186,7 @@ class ConnectCommand extends Command
 
         // ── Persist ──────────────────────────────────────────────────────────
 
-        $this->sessionTenant->configureById($tenantId);
+        $this->tenantContext->resolveIdentifier($tenantId);
 
         $label = $io->ask('Service label', $username);
         if ($label) {

lib/Console/DisconnectCommand.php

@@ -11,7 +11,7 @@ namespace KTXM\ProviderImap\Console;
 
 use KTXM\ProviderImap\Providers\Provider;
 use KTXM\ProviderImap\Providers\Service;
-use KTXC\SessionTenant;
+use KTXC\Context\TenantContext;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -37,7 +37,7 @@ class DisconnectCommand extends Command
 {
     public function __construct(
         private readonly Provider      $provider,
-        private readonly SessionTenant $sessionTenant,
+        private readonly TenantContext $tenantContext,
     ) {
         parent::__construct();
     }
@@ -86,7 +86,7 @@ class DisconnectCommand extends Command
             $userId   = (string) ($input->getOption('user') ?? '');
 
             if ($tenantId !== '' && $userId !== '') {
-                $this->sessionTenant->configureById($tenantId);
+                $this->tenantContext->resolveIdentifier($tenantId);
                 $services = $this->provider->serviceList($tenantId, $userId);
 
                 if (empty($services)) {
@@ -130,7 +130,7 @@ class DisconnectCommand extends Command
         }
 
         // ── Fetch service for display ────────────────────────────────────────
-        $this->sessionTenant->configureById($tenantId);
+        $this->tenantContext->resolveIdentifier($tenantId);
         $service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
 
         if ($service === null) {

lib/Console/DiscoverCommand.php

@@ -14,7 +14,7 @@ use KTXM\ProviderImap\Providers\Service;
 use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
 use KTXM\ProviderImap\Providers\ServiceLocation;
 use KTXM\ProviderImap\Service\Discovery;
-use KTXC\SessionTenant;
+use KTXC\Context\TenantContext;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -43,7 +43,7 @@ class DiscoverCommand extends Command
     public function __construct(
         private readonly Provider      $provider,
         private readonly Discovery     $discovery,
-        private readonly SessionTenant $sessionTenant,
+        private readonly TenantContext $tenantContext,
     ) {
         parent::__construct();
     }
@@ -210,7 +210,7 @@ class DiscoverCommand extends Command
 
         // ── Persist ──────────────────────────────────────────────────────────
 
-        $this->sessionTenant->configureById($tenantId);
+        $this->tenantContext->resolveIdentifier($tenantId);
 
         $label = $io->ask('Service label', $address);
         if ($label) {

lib/Console/TestCommand.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderImap\Console;
 
-use KTXC\SessionTenant;
+use KTXC\Context\TenantContext;
 use KTXM\ProviderImap\Client\Command\SelectCommand;
 use KTXM\ProviderImap\Client\FetchOptions;
 use KTXM\ProviderImap\Client\FetchTarget;
@@ -41,7 +41,7 @@ class TestCommand extends Command
 {
     public function __construct(
         private readonly Provider $provider,
-        private readonly SessionTenant $sessionTenant,
+        private readonly TenantContext $tenantContext,
     ) {
         parent::__construct();
     }
@@ -108,7 +108,7 @@ class TestCommand extends Command
             return Command::FAILURE;
         }
 
-        $this->sessionTenant->configureById($tenantId);
+        $this->tenantContext->resolveIdentifier($tenantId);
         $service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
 
         if ($service === null) {
@@ -269,7 +269,7 @@ class TestCommand extends Command
             return;
         }
 
-        $this->sessionTenant->configureById($tenantId);
+        $this->tenantContext->resolveIdentifier($tenantId);
         $services = $this->provider->serviceList($tenantId, $userId);
 
         if ($services === []) {

lib/Listeners/UserEventListener.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXM\ProviderImap\Listeners;
+
+use KTXC\User\Event\UserCreatedEvent;
+use KTXC\User\Event\UserDeletingEvent;
+use KTXM\ProviderImap\Stores\MessageStore;
+use KTXM\ProviderImap\Stores\ServiceStore;
+
+final class UserEventListener
+{
+    public function __construct(
+        private readonly ServiceStore $serviceStore,
+        private readonly MessageStore $messageStore,
+    ) {
+    }
+
+    public function onUserCreated(UserCreatedEvent $event): void
+    {
+        // TODO: implement provisioning configuration
+    }
+
+    public function onUserDeleting(UserDeletingEvent $event): void
+    {
+        $tenantId = $event->tenantIdentifier();
+        $userId = $event->userIdentifier();
+
+        foreach (array_keys($this->serviceStore->list($tenantId, $userId)) as $serviceId) {
+            $this->messageStore->deleteByServiceId((string) $serviceId);
+        }
+
+        $this->serviceStore->deleteByUser($tenantId, $userId);
+    }
+}

lib/Module.php

@@ -10,6 +10,10 @@ declare(strict_types=1);
 namespace KTXM\ProviderImap;
 
 use KTXC\Resource\ProviderManager;
+use KTXC\User\Event\UserCreatedEvent;
+use KTXC\User\Event\UserDeletingEvent;
+use KTXF\Event\DeliveryMode;
+use KTXF\Event\EventListenerRegistrarInterface;
 use KTXF\Module\ModuleBrowserInterface;
 use KTXF\Module\ModuleConsoleInterface;
 use KTXF\Module\ModuleInstanceAbstract;
@@ -18,6 +22,7 @@ use KTXM\ProviderImap\Console\ConnectCommand;
 use KTXM\ProviderImap\Console\DiscoverCommand;
 use KTXM\ProviderImap\Console\DisconnectCommand;
 use KTXM\ProviderImap\Console\TestCommand;
+use KTXM\ProviderImap\Listeners\UserEventListener;
 use KTXM\ProviderImap\Providers\Provider as MailProvider;
 
 /**
@@ -29,6 +34,7 @@ class Module extends ModuleInstanceAbstract implements ModuleConsoleInterface, M
 {
     public function __construct(
         private readonly ProviderManager $providerManager,
+        private readonly EventListenerRegistrarInterface $events,
     ) {}
 
     public function handle(): string
@@ -69,6 +75,10 @@ class Module extends ModuleInstanceAbstract implements ModuleConsoleInterface, M
 
     public function boot(): void
     {
+        // Register listeners
+        $this->events->listen($this->handle(), UserCreatedEvent::class, UserEventListener::class, 'onUserCreated', DeliveryMode::Deferred);
+        $this->events->listen($this->handle(), UserDeletingEvent::class, UserEventListener::class, 'onUserDeleting', DeliveryMode::Deferred);
+        // Register providers
         $this->providerManager->register(ProviderInterface::TYPE_MAIL, 'imap', MailProvider::class);
     }
 

lib/Providers/Service.php

@@ -200,8 +200,9 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         if (isset($data[self::PROPERTY_IDENTITY])) {
             $this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY]));
         }
-        if (isset($data[self::PROPERTY_PRIMARY_ADDRESS]) && is_string($data[self::PROPERTY_PRIMARY_ADDRESS])) {
+        if (isset($data[self::PROPERTY_PRIMARY_ADDRESS])) {
-            $this->setPrimaryAddress(new Address($data[self::PROPERTY_PRIMARY_ADDRESS]));
+            $value = $data[self::PROPERTY_PRIMARY_ADDRESS];
+            $this->setPrimaryAddress(is_array($value) ? Address::fromArray($value) : new Address((string)$value));
         }
         if (isset($data[self::PROPERTY_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
             $this->setSecondaryAddresses(array_map(

lib/Service/Remote/RemoteMailService.php

@@ -11,7 +11,6 @@ namespace KTXM\ProviderImap\Service\Remote;
 
 use DateTimeImmutable;
 use Generator;
-use KTXC\Server;
 use KTXC\Logger\PlainFileLogger;
 use KTXM\ProviderImap\Client\Client as ImapClient;
 use KTXM\ProviderImap\Client\Command\AppendCommand;
@@ -132,7 +131,7 @@ class RemoteMailService
             return null;
         }
 
-        $logDir = Server::getInstance()?->logDir() ?? __DIR__ . '/../../../../../var/log';
+        $logDir = dirname(__DIR__, 5) . '/var/log';
 
         return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier());
     }

lib/Stores/ServiceStore.php

@@ -177,4 +177,15 @@ class ServiceStore
         return $result->getDeletedCount() > 0;
     }
 
+    /**
+     * Delete every service owned by a user.
+     */
+    public function deleteByUser(string $tenantId, string $userId): void
+    {
+        $this->dataStore->selectCollection(self::COLLECTION_NAME)->deleteMany([
+            'tid' => $tenantId,
+            'uid' => $userId,
+        ]);
+    }
+
 }

src/components/ImapAuthPanel.vue

@@ -115,7 +115,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
       variant="outlined"
       prepend-inner-icon="mdi-account"
       class="mb-4"
-      autocomplete="username"
+      autocomplete="off"
       autocorrect="off"
       autocapitalize="none"
       :rules="[rules.required]"
@@ -130,7 +130,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
       variant="outlined"
       prepend-inner-icon="mdi-lock"
       class="mb-4"
-      autocomplete="current-password"
+      autocomplete="new-password"
       :rules="[rules.required]"
     />
   </div>