1 Commits

Author SHA1 Message Date
Sebastian d7166a0dfe chore: implement js test suites
JS Unit Tests / test (pull_request) Successful in 34s
Build Test / test (pull_request) Failing after 37s
PHP Unit Tests / test (pull_request) Successful in 2m24s
PHP Integration Tests / Integration Tests (pull_request) Successful in 2m48s
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
2026-07-24 00:13:52 -04:00
14 changed files with 520 additions and 211 deletions
-8
View File
@@ -25,14 +25,6 @@ jobs:
node-version: '24' node-version: '24'
server-path: './server' server-path: './server'
- name: Install Mail Manager
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/mail_manager
ref: main
path: server/modules/mail_manager
github-server-url: https://git.ktrix.dev
- name: Checkout Pull Request - name: Checkout Pull Request
uses: actions/checkout@v6.0.2 uses: actions/checkout@v6.0.2
with: with:
-8
View File
@@ -25,14 +25,6 @@ jobs:
node-version: '24' node-version: '24'
server-path: './server' server-path: './server'
- name: Install Mail Manager
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/mail_manager
ref: main
path: server/modules/mail_manager
github-server-url: https://git.ktrix.dev
- name: Checkout Pull Request - name: Checkout Pull Request
uses: actions/checkout@v6.0.2 uses: actions/checkout@v6.0.2
with: with:
+1 -1
View File
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
services: services:
mongo: mongo:
image: mongo:8 image: mongo:7
options: >- options: >-
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\"" --health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
--health-interval 5s --health-interval 5s
+3 -3
View File
@@ -13,7 +13,7 @@ use KTXM\ProviderImap\Providers\Provider;
use KTXM\ProviderImap\Providers\Service; use KTXM\ProviderImap\Providers\Service;
use KTXM\ProviderImap\Providers\ServiceIdentityBasic; use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
use KTXM\ProviderImap\Providers\ServiceLocation; use KTXM\ProviderImap\Providers\ServiceLocation;
use KTXC\Context\TenantContext; use KTXC\SessionTenant;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -41,7 +41,7 @@ class ConnectCommand extends Command
{ {
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly TenantContext $tenantContext, private readonly SessionTenant $sessionTenant,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -186,7 +186,7 @@ class ConnectCommand extends Command
// ── Persist ────────────────────────────────────────────────────────── // ── Persist ──────────────────────────────────────────────────────────
$this->tenantContext->resolveIdentifier($tenantId); $this->sessionTenant->configureById($tenantId);
$label = $io->ask('Service label', $username); $label = $io->ask('Service label', $username);
if ($label) { if ($label) {
+4 -4
View File
@@ -11,7 +11,7 @@ namespace KTXM\ProviderImap\Console;
use KTXM\ProviderImap\Providers\Provider; use KTXM\ProviderImap\Providers\Provider;
use KTXM\ProviderImap\Providers\Service; use KTXM\ProviderImap\Providers\Service;
use KTXC\Context\TenantContext; use KTXC\SessionTenant;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -37,7 +37,7 @@ class DisconnectCommand extends Command
{ {
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly TenantContext $tenantContext, private readonly SessionTenant $sessionTenant,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -86,7 +86,7 @@ class DisconnectCommand extends Command
$userId = (string) ($input->getOption('user') ?? ''); $userId = (string) ($input->getOption('user') ?? '');
if ($tenantId !== '' && $userId !== '') { if ($tenantId !== '' && $userId !== '') {
$this->tenantContext->resolveIdentifier($tenantId); $this->sessionTenant->configureById($tenantId);
$services = $this->provider->serviceList($tenantId, $userId); $services = $this->provider->serviceList($tenantId, $userId);
if (empty($services)) { if (empty($services)) {
@@ -130,7 +130,7 @@ class DisconnectCommand extends Command
} }
// ── Fetch service for display ──────────────────────────────────────── // ── Fetch service for display ────────────────────────────────────────
$this->tenantContext->resolveIdentifier($tenantId); $this->sessionTenant->configureById($tenantId);
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId); $service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
if ($service === null) { if ($service === null) {
+3 -3
View File
@@ -14,7 +14,7 @@ use KTXM\ProviderImap\Providers\Service;
use KTXM\ProviderImap\Providers\ServiceIdentityBasic; use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
use KTXM\ProviderImap\Providers\ServiceLocation; use KTXM\ProviderImap\Providers\ServiceLocation;
use KTXM\ProviderImap\Service\Discovery; use KTXM\ProviderImap\Service\Discovery;
use KTXC\Context\TenantContext; use KTXC\SessionTenant;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -43,7 +43,7 @@ class DiscoverCommand extends Command
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly Discovery $discovery, private readonly Discovery $discovery,
private readonly TenantContext $tenantContext, private readonly SessionTenant $sessionTenant,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -210,7 +210,7 @@ class DiscoverCommand extends Command
// ── Persist ────────────────────────────────────────────────────────── // ── Persist ──────────────────────────────────────────────────────────
$this->tenantContext->resolveIdentifier($tenantId); $this->sessionTenant->configureById($tenantId);
$label = $io->ask('Service label', $address); $label = $io->ask('Service label', $address);
if ($label) { if ($label) {
+4 -4
View File
@@ -9,7 +9,7 @@ declare(strict_types=1);
namespace KTXM\ProviderImap\Console; namespace KTXM\ProviderImap\Console;
use KTXC\Context\TenantContext; use KTXC\SessionTenant;
use KTXM\ProviderImap\Client\Command\SelectCommand; use KTXM\ProviderImap\Client\Command\SelectCommand;
use KTXM\ProviderImap\Client\FetchOptions; use KTXM\ProviderImap\Client\FetchOptions;
use KTXM\ProviderImap\Client\FetchTarget; use KTXM\ProviderImap\Client\FetchTarget;
@@ -41,7 +41,7 @@ class TestCommand extends Command
{ {
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly TenantContext $tenantContext, private readonly SessionTenant $sessionTenant,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -108,7 +108,7 @@ class TestCommand extends Command
return Command::FAILURE; return Command::FAILURE;
} }
$this->tenantContext->resolveIdentifier($tenantId); $this->sessionTenant->configureById($tenantId);
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId); $service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
if ($service === null) { if ($service === null) {
@@ -269,7 +269,7 @@ class TestCommand extends Command
return; return;
} }
$this->tenantContext->resolveIdentifier($tenantId); $this->sessionTenant->configureById($tenantId);
$services = $this->provider->serviceList($tenantId, $userId); $services = $this->provider->serviceList($tenantId, $userId);
if ($services === []) { if ($services === []) {
-36
View File
@@ -1,36 +0,0 @@
<?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);
}
}
-10
View File
@@ -10,10 +10,6 @@ declare(strict_types=1);
namespace KTXM\ProviderImap; namespace KTXM\ProviderImap;
use KTXC\Resource\ProviderManager; 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\ModuleBrowserInterface;
use KTXF\Module\ModuleConsoleInterface; use KTXF\Module\ModuleConsoleInterface;
use KTXF\Module\ModuleInstanceAbstract; use KTXF\Module\ModuleInstanceAbstract;
@@ -22,7 +18,6 @@ use KTXM\ProviderImap\Console\ConnectCommand;
use KTXM\ProviderImap\Console\DiscoverCommand; use KTXM\ProviderImap\Console\DiscoverCommand;
use KTXM\ProviderImap\Console\DisconnectCommand; use KTXM\ProviderImap\Console\DisconnectCommand;
use KTXM\ProviderImap\Console\TestCommand; use KTXM\ProviderImap\Console\TestCommand;
use KTXM\ProviderImap\Listeners\UserEventListener;
use KTXM\ProviderImap\Providers\Provider as MailProvider; use KTXM\ProviderImap\Providers\Provider as MailProvider;
/** /**
@@ -34,7 +29,6 @@ class Module extends ModuleInstanceAbstract implements ModuleConsoleInterface, M
{ {
public function __construct( public function __construct(
private readonly ProviderManager $providerManager, private readonly ProviderManager $providerManager,
private readonly EventListenerRegistrarInterface $events,
) {} ) {}
public function handle(): string public function handle(): string
@@ -75,10 +69,6 @@ class Module extends ModuleInstanceAbstract implements ModuleConsoleInterface, M
public function boot(): void 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); $this->providerManager->register(ProviderInterface::TYPE_MAIL, 'imap', MailProvider::class);
} }
+2 -3
View File
@@ -200,9 +200,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
if (isset($data[self::PROPERTY_IDENTITY])) { if (isset($data[self::PROPERTY_IDENTITY])) {
$this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY])); $this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY]));
} }
if (isset($data[self::PROPERTY_PRIMARY_ADDRESS])) { if (isset($data[self::PROPERTY_PRIMARY_ADDRESS]) && is_string($data[self::PROPERTY_PRIMARY_ADDRESS])) {
$value = $data[self::PROPERTY_PRIMARY_ADDRESS]; $this->setPrimaryAddress(new Address($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])) { if (isset($data[self::PROPERTY_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
$this->setSecondaryAddresses(array_map( $this->setSecondaryAddresses(array_map(
+2 -1
View File
@@ -11,6 +11,7 @@ namespace KTXM\ProviderImap\Service\Remote;
use DateTimeImmutable; use DateTimeImmutable;
use Generator; use Generator;
use KTXC\Server;
use KTXC\Logger\PlainFileLogger; use KTXC\Logger\PlainFileLogger;
use KTXM\ProviderImap\Client\Client as ImapClient; use KTXM\ProviderImap\Client\Client as ImapClient;
use KTXM\ProviderImap\Client\Command\AppendCommand; use KTXM\ProviderImap\Client\Command\AppendCommand;
@@ -131,7 +132,7 @@ class RemoteMailService
return null; return null;
} }
$logDir = dirname(__DIR__, 5) . '/var/log'; $logDir = Server::getInstance()?->logDir() ?? __DIR__ . '/../../../../../var/log';
return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier()); return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier());
} }
-11
View File
@@ -177,15 +177,4 @@ class ServiceStore
return $result->getDeletedCount() > 0; 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,
]);
}
} }
+499 -117
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -115,7 +115,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
variant="outlined" variant="outlined"
prepend-inner-icon="mdi-account" prepend-inner-icon="mdi-account"
class="mb-4" class="mb-4"
autocomplete="off" autocomplete="username"
autocorrect="off" autocorrect="off"
autocapitalize="none" autocapitalize="none"
:rules="[rules.required]" :rules="[rules.required]"
@@ -130,7 +130,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
variant="outlined" variant="outlined"
prepend-inner-icon="mdi-lock" prepend-inner-icon="mdi-lock"
class="mb-4" class="mb-4"
autocomplete="new-password" autocomplete="current-password"
:rules="[rules.required]" :rules="[rules.required]"
/> />
</div> </div>