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
17 changed files with 532 additions and 441 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
Generated
+8 -8
View File
@@ -273,16 +273,16 @@
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v7.4.18", "version": "v7.4.13",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "bf328d82105831db3e409195db0540ff57f27c80" "reference": "a845722765c4f6b2ce88beaf4f4479975b186770"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/bf328d82105831db3e409195db0540ff57f27c80", "url": "https://api.github.com/repos/symfony/mime/zipball/a845722765c4f6b2ce88beaf4f4479975b186770",
"reference": "bf328d82105831db3e409195db0540ff57f27c80", "reference": "a845722765c4f6b2ce88beaf4f4479975b186770",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -306,7 +306,7 @@
"symfony/process": "^6.4|^7.0|^8.0", "symfony/process": "^6.4|^7.0|^8.0",
"symfony/property-access": "^6.4|^7.0|^8.0", "symfony/property-access": "^6.4|^7.0|^8.0",
"symfony/property-info": "^6.4|^7.0|^8.0", "symfony/property-info": "^6.4|^7.0|^8.0",
"symfony/serializer": "^6.4.44|^7.4.17|^8.1.5" "symfony/serializer": "^6.4.3|^7.0.3|^8.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -338,7 +338,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v7.4.18" "source": "https://github.com/symfony/mime/tree/v7.4.13"
}, },
"funding": [ "funding": [
{ {
@@ -358,7 +358,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2026-08-22T09:04:42+00:00" "time": "2026-05-23T16:22:37+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
@@ -2315,5 +2315,5 @@
"platform-overrides": { "platform-overrides": {
"php": "8.3" "php": "8.3"
}, },
"plugin-api-version": "2.9.0" "plugin-api-version": "2.6.0"
} }
+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);
} }
-21
View File
@@ -11,7 +11,6 @@ namespace KTXM\ProviderImap\Providers;
use KTXM\ProviderImap\Client\Message; use KTXM\ProviderImap\Client\Message;
use KTXF\Mail\Entity\EntityMutableAbstract; use KTXF\Mail\Entity\EntityMutableAbstract;
use KTXF\Mail\Object\MessagePropertiesMutableInterface;
/** /**
* Mail Entity Resource Implementation * Mail Entity Resource Implementation
@@ -43,26 +42,6 @@ class EntityResource extends EntityMutableAbstract {
return $this; return $this;
} }
/**
* Populate an entity returned by a create or replacement operation.
*/
public function fromMutation(
string $mailbox,
string|int $identifier,
MessagePropertiesMutableInterface $properties,
): static {
$this->data['collection'] = $mailbox;
$this->data['identifier'] = $identifier;
if ($properties instanceof MessageProperties) {
$this->setProperties($properties);
} else {
$this->getProperties()->jsonDeserialize($properties->jsonSerialize());
}
return $this;
}
/** /**
* @inheritDoc * @inheritDoc
*/ */
+6 -98
View File
@@ -102,8 +102,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
], ],
self::CAPABILITY_ENTITY_FETCH => true, self::CAPABILITY_ENTITY_FETCH => true,
self::CAPABILITY_ENTITY_EXTANT => true, self::CAPABILITY_ENTITY_EXTANT => true,
self::CAPABILITY_ENTITY_CREATE => true, self::CAPABILITY_ENTITY_CREATE => false,
self::CAPABILITY_ENTITY_MODIFY => true, self::CAPABILITY_ENTITY_MODIFY => false,
self::CAPABILITY_ENTITY_PATCH => true, self::CAPABILITY_ENTITY_PATCH => true,
self::CAPABILITY_ENTITY_DELETE => true, self::CAPABILITY_ENTITY_DELETE => true,
self::CAPABILITY_ENTITY_MOVE => true, self::CAPABILITY_ENTITY_MOVE => true,
@@ -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(
@@ -675,27 +674,10 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
// ignore — the message was already delivered // ignore — the message was already delivered
} }
// Best-effort: IMAP has no native "submit existing draft" operation, so the
// message above was always sent fresh. If it originated from a synced draft,
// remove the now-superseded draft UID. A failure here must not turn a
// successful delivery into an error; the draft is simply left for a later
// discard or retry.
if ($source !== null
&& $source->provider() === $this->provider()
&& $source->service() === $this->identifier()) {
try {
$this->initialize();
$this->remoteService->entityDestroy($source->collection(), (int) $source->entity());
} catch (\Throwable) {
// ignore — the message was already delivered
}
}
return new EntitySubmitResult( return new EntitySubmitResult(
disposition: EntitySubmitResult::DISPOSITION_SENT, disposition: EntitySubmitResult::DISPOSITION_SENT,
transportId: $queueId !== '' ? $queueId : null, transportId: $queueId !== '' ? $queueId : null,
sentEntity: $sentEntity, sentEntity: $sentEntity,
sourceDraft: $source instanceof EntityIdentifier ? $source : null,
); );
} }
@@ -718,45 +700,12 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
public function entityCreate(CollectionIdentifier $target, MessagePropertiesMutableInterface $properties, array $options = []): EntityResource public function entityCreate(CollectionIdentifier $target, MessagePropertiesMutableInterface $properties, array $options = []): EntityResource
{ {
if ($target->provider() !== $this->provider() || (string)$target->service() !== (string)$this->identifier()) { throw new \RuntimeException('Entity creation is not supported in this service');
throw new \InvalidArgumentException('Target collection does not belong to this service: ' . (string)$target);
}
$this->initialize();
[$nativeMessage, $nativeFlags] = $this->messagePayload($properties, $options);
$created = $this->remoteService->entityCreate(
(string)$target->collection(),
$nativeMessage,
$nativeFlags,
);
if ($created === null || $created <= 0) {
throw new \RuntimeException('IMAP APPEND did not return a valid UID');
}
return $this->entityFresh()->fromMutation((string)$target->collection(), $created, $properties);
} }
public function entityModify(EntityIdentifier $target, MessagePropertiesMutableInterface $properties): EntityResource public function entityModify(EntityIdentifier $target, MessagePropertiesMutableInterface $properties): EntityResource
{ {
if ($target->provider() !== $this->provider() || (string)$target->service() !== (string)$this->identifier()) { throw new \RuntimeException('Entity modification is not supported in this service');
throw new \InvalidArgumentException('Target entity does not belong to this service: ' . (string)$target);
}
$this->initialize();
[$nativeMessage, $nativeFlags] = $this->messagePayload($properties);
$modified = $this->remoteService->entityReplace(
(string)$target->collection(),
(int)$target->entity(),
$nativeMessage,
$nativeFlags,
);
if ($modified === null || $modified <= 0) {
throw new \RuntimeException('IMAP replacement did not return a valid UID');
}
return $this->entityFresh()->fromMutation((string)$target->collection(), $modified, $properties);
} }
public function entityPatch(MessagePropertiesMutableInterface $properties, EntityIdentifier ...$targets): array public function entityPatch(MessagePropertiesMutableInterface $properties, EntityIdentifier ...$targets): array
@@ -942,45 +891,4 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return $list; return $list;
} }
/**
* Convert canonical message flags to IMAP system flags.
*
* @return string[]
*/
private function messageFlags(MessagePropertiesMutableInterface $properties): array
{
$flags = [];
foreach ($properties->getFlags() as $flag => $enabled) {
if ($enabled !== true) {
continue;
}
$flags[] = match (strtolower((string)$flag)) {
'seen' => '\\Seen',
'flagged' => '\\Flagged',
'answered' => '\\Answered',
'draft' => '\\Draft',
'deleted' => '\\Deleted',
default => (string)$flag,
};
}
return array_values(array_unique($flags));
}
/**
* Convert message properties into the native IMAP append payload.
*
* @return array{0: string, 1: string[]}
*/
private function messagePayload(MessagePropertiesMutableInterface $properties, array $options = []): array
{
$flags = $this->messageFlags($properties);
if (isset($options['flags']) && is_array($options['flags'])) {
$flags = array_values(array_unique([...$flags, ...$options['flags']]));
}
return [(new MessageBuilder())->build($properties), $flags];
}
} }
+2 -39
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/logs/provider_imap'; $logDir = Server::getInstance()?->logDir() ?? __DIR__ . '/../../../../../var/log';
return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier()); return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier());
} }
@@ -490,44 +491,6 @@ class RemoteMailService
return $this->imapClient()->perform(new AppendCommand($collection, $rawMessage, $flags)); return $this->imapClient()->perform(new AppendCommand($collection, $rawMessage, $flags));
} }
/**
* Append a replacement message, then permanently remove the superseded UID.
* The replacement is removed on cleanup failure so the old UID remains
* authoritative for a later retry.
*
* @param string[] $flags
*/
public function entityReplace(
string $collection,
int $identifier,
string $rawMessage,
array $flags = [],
): ?int {
if ($identifier <= 0) {
throw new RuntimeException('A valid IMAP UID is required for replacement');
}
$replacement = $this->entityCreate($collection, $rawMessage, $flags);
if ($replacement === null || $replacement <= 0) {
throw new RuntimeException('IMAP replacement append did not return a valid UID');
}
try {
$deleted = $this->entityDestroy($collection, $identifier);
if (($deleted[$identifier] ?? false) !== true) {
throw new RuntimeException('Failed to delete the superseded IMAP entity');
}
} catch (\Throwable $error) {
try {
$this->entityDestroy($collection, $replacement);
} catch (\Throwable) {
}
throw $error;
}
return $replacement;
}
/** /**
* Modify message flags for one or more messages. * Modify message flags for one or more messages.
* *
-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>
-68
View File
@@ -1,68 +0,0 @@
<?php
declare(strict_types=1);
namespace KTXT\ProviderImap\Tests\Unit;
use KTXM\ProviderImap\Providers\Service;
use KTXM\ProviderImap\Service\Remote\RemoteMailService;
use PHPUnit\Framework\TestCase;
use RuntimeException;
final class RemoteMailServiceTest extends TestCase {
public function testEntityReplaceReturnsAuthoritativeReplacementUid(): void {
$service = new RemoteMailServiceStub($this->createStub(Service::class));
$service->appendUid = 202;
$service->destroyResults = [[101 => true]];
$result = $service->entityReplace('Drafts', 101, 'raw message', ['\\Draft']);
$this->assertSame(202, $result);
$this->assertSame([
['Drafts', 'raw message', ['\\Draft']],
], $service->createCalls);
$this->assertSame([
['Drafts', [101]],
], $service->destroyCalls);
}
public function testEntityReplaceRemovesReplacementWhenOldUidCannotBeDeleted(): void {
$service = new RemoteMailServiceStub($this->createStub(Service::class));
$service->appendUid = 202;
$service->destroyResults = [
[101 => false],
[202 => true],
];
try {
$service->entityReplace('Drafts', 101, 'raw message', ['\\Draft']);
$this->fail('Expected superseded message cleanup failure');
} catch (RuntimeException $exception) {
$this->assertSame('Failed to delete the superseded IMAP entity', $exception->getMessage());
}
$this->assertSame([
['Drafts', [101]],
['Drafts', [202]],
], $service->destroyCalls);
}
}
final class RemoteMailServiceStub extends RemoteMailService {
public ?int $appendUid = null;
public array $createCalls = [];
public array $destroyCalls = [];
public array $destroyResults = [];
public function entityCreate(string $collection, string $rawMessage, array $flags = []): ?int {
$this->createCalls[] = [$collection, $rawMessage, $flags];
return $this->appendUid;
}
public function entityDestroy(string $collection, int ...$uids): array {
$this->destroyCalls[] = [$collection, $uids];
return array_shift($this->destroyResults) ?? [];
}
}