Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Sebastian
|
dbd7b4711b |
Generated
+46
-58
@@ -8,21 +8,21 @@
|
||||
"packages": [
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
"version": "7.15.1",
|
||||
"version": "7.15.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/guzzle.git",
|
||||
"reference": "61443dfb33c62f308ee8add20f45b4d6e4bf8d2f"
|
||||
"reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/61443dfb33c62f308ee8add20f45b4d6e4bf8d2f",
|
||||
"reference": "61443dfb33c62f308ee8add20f45b4d6e4bf8d2f",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",
|
||||
"reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"guzzlehttp/promises": "^2.5.1",
|
||||
"guzzlehttp/promises": "^2.5.2",
|
||||
"guzzlehttp/psr7": "^2.13",
|
||||
"php": "^7.2.5 || ^8.0",
|
||||
"psr/http-client": "^1.0",
|
||||
@@ -116,7 +116,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/guzzle/issues",
|
||||
"source": "https://github.com/guzzle/guzzle/tree/7.15.1"
|
||||
"source": "https://github.com/guzzle/guzzle/tree/7.15.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -132,20 +132,20 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2026-07-18T11:23:11+00:00"
|
||||
"time": "2026-08-05T19:48:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
"version": "2.5.1",
|
||||
"version": "2.5.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/promises.git",
|
||||
"reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29"
|
||||
"reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/9ad1e4fc607446a055b95870c7f668e93b5cff29",
|
||||
"reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/2823687acff28b2dbe67b2508a6b300e2c3fa4ce",
|
||||
"reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -200,7 +200,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/promises/issues",
|
||||
"source": "https://github.com/guzzle/promises/tree/2.5.1"
|
||||
"source": "https://github.com/guzzle/promises/tree/2.5.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -216,7 +216,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2026-07-08T15:48:39+00:00"
|
||||
"time": "2026-08-05T19:30:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
@@ -862,20 +862,20 @@
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "myclabs/deep-copy",
|
||||
"version": "1.14.0",
|
||||
"version": "1.13.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/myclabs/DeepCopy.git",
|
||||
"reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae"
|
||||
"reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
|
||||
"reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
|
||||
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
|
||||
"reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^8.0"
|
||||
"php": "^7.1 || ^8.0"
|
||||
},
|
||||
"conflict": {
|
||||
"doctrine/collections": "<1.6.8",
|
||||
@@ -910,15 +910,15 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/myclabs/DeepCopy/issues",
|
||||
"source": "https://github.com/myclabs/DeepCopy/tree/1.14.0"
|
||||
"source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/mnapoli",
|
||||
"type": "github"
|
||||
"url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2026-08-11T10:17:44+00:00"
|
||||
"time": "2025-08-01T08:46:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
@@ -1185,23 +1185,23 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
"version": "6.0.2",
|
||||
"version": "6.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
|
||||
"reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5"
|
||||
"reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5",
|
||||
"reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
|
||||
"reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^12.5.33"
|
||||
"phpunit/phpunit": "^12.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -1234,7 +1234,7 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
|
||||
"security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2"
|
||||
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -1254,7 +1254,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2026-08-25T14:40:53+00:00"
|
||||
"time": "2026-02-02T14:04:18+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-invoker",
|
||||
@@ -1442,16 +1442,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "12.5.35",
|
||||
"version": "12.5.31",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "345ac22e42cb14cdc7aa8428655d8bb8c82a4aab"
|
||||
"reference": "0608d157a284f15cc73b99a3327eff06b66a176d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/345ac22e42cb14cdc7aa8428655d8bb8c82a4aab",
|
||||
"reference": "345ac22e42cb14cdc7aa8428655d8bb8c82a4aab",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0608d157a284f15cc73b99a3327eff06b66a176d",
|
||||
"reference": "0608d157a284f15cc73b99a3327eff06b66a176d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1461,18 +1461,18 @@
|
||||
"ext-libxml": "*",
|
||||
"ext-mbstring": "*",
|
||||
"ext-xmlwriter": "*",
|
||||
"myclabs/deep-copy": "^1.14.0",
|
||||
"myclabs/deep-copy": "^1.13.4",
|
||||
"phar-io/manifest": "^2.0.4",
|
||||
"phar-io/version": "^3.2.1",
|
||||
"php": ">=8.3",
|
||||
"phpunit/php-code-coverage": "^12.5.7",
|
||||
"phpunit/php-file-iterator": "^6.0.2",
|
||||
"phpunit/php-file-iterator": "^6.0.1",
|
||||
"phpunit/php-invoker": "^6.0.0",
|
||||
"phpunit/php-text-template": "^5.0.0",
|
||||
"phpunit/php-timer": "^8.0.0",
|
||||
"sebastian/cli-parser": "^4.2.1",
|
||||
"sebastian/comparator": "^7.1.8",
|
||||
"sebastian/diff": "^7.0.1",
|
||||
"sebastian/diff": "^7.0.0",
|
||||
"sebastian/environment": "^8.1.2",
|
||||
"sebastian/exporter": "^7.0.3",
|
||||
"sebastian/global-state": "^8.0.3",
|
||||
@@ -1520,7 +1520,7 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.35"
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.31"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -1528,7 +1528,7 @@
|
||||
"type": "other"
|
||||
}
|
||||
],
|
||||
"time": "2026-09-09T04:48:50+00:00"
|
||||
"time": "2026-07-06T14:54:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/cli-parser",
|
||||
@@ -1751,24 +1751,24 @@
|
||||
},
|
||||
{
|
||||
"name": "sebastian/diff",
|
||||
"version": "7.0.1",
|
||||
"version": "7.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/diff.git",
|
||||
"reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6"
|
||||
"reference": "7ab1ea946c012266ca32390913653d844ecd085f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
|
||||
"reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
|
||||
"reference": "7ab1ea946c012266ca32390913653d844ecd085f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^12.5.33",
|
||||
"symfony/process": "^7.4.17"
|
||||
"phpunit/phpunit": "^12.0",
|
||||
"symfony/process": "^7.2"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -1806,27 +1806,15 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/diff/issues",
|
||||
"security": "https://github.com/sebastianbergmann/diff/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/diff/tree/7.0.1"
|
||||
"source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/sebastianbergmann",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://liberapay.com/sebastianbergmann",
|
||||
"type": "liberapay"
|
||||
},
|
||||
{
|
||||
"url": "https://thanks.dev/u/gh/sebastianbergmann",
|
||||
"type": "thanks_dev"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2026-08-25T15:35:54+00:00"
|
||||
"time": "2025-02-07T04:55:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/environment",
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace KTXM\ProviderJmapc\Listeners;
|
||||
|
||||
use KTXC\User\Event\UserCreatedEvent;
|
||||
use KTXC\User\Event\UserDeletingEvent;
|
||||
use KTXM\ProviderJmapc\Stores\ServiceStore;
|
||||
|
||||
final class UserEventListener
|
||||
{
|
||||
public function __construct(
|
||||
private readonly ServiceStore $serviceStore,
|
||||
) {
|
||||
}
|
||||
|
||||
public function onUserCreated(UserCreatedEvent $event): void
|
||||
{
|
||||
// TODO: implement provisioning configuration
|
||||
}
|
||||
|
||||
public function onUserDeleting(UserDeletingEvent $event): void
|
||||
{
|
||||
$this->serviceStore->deleteByUser($event->tenantIdentifier(), $event->userIdentifier());
|
||||
}
|
||||
}
|
||||
+12
-17
@@ -10,15 +10,9 @@ declare(strict_types=1);
|
||||
namespace KTXM\ProviderJmapc;
|
||||
|
||||
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\Configuration\BrowserModuleContextInterface;
|
||||
use KTXF\Module\Configuration\ModuleContextInterface;
|
||||
use KTXF\Module\ModuleBrowserInterface;
|
||||
use KTXF\Module\ModuleInstanceAbstract;
|
||||
use KTXF\Resource\Provider\ProviderInterface;
|
||||
use KTXM\ProviderJmapc\Listeners\UserEventListener;
|
||||
use KTXM\ProviderJmapc\Providers\Mail\Provider as MailProvider;
|
||||
use KTXM\ProviderJmapc\Providers\Chrono\Provider as ChronoProvider;
|
||||
use KTXM\ProviderJmapc\Providers\People\Provider as PeopleProvider;
|
||||
@@ -29,11 +23,10 @@ use KTXM\ProviderJmapc\Providers\Document\Provider as DocumentProvider;
|
||||
*
|
||||
* Provides mail, calendar, and contacts services via JMAP protocol.
|
||||
*/
|
||||
class Module extends ModuleInstanceAbstract
|
||||
class Module extends ModuleInstanceAbstract implements ModuleBrowserInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly ProviderManager $providerManager,
|
||||
private readonly EventListenerRegistrarInterface $events,
|
||||
) {}
|
||||
|
||||
public function handle(): string
|
||||
@@ -74,9 +67,6 @@ class Module extends ModuleInstanceAbstract
|
||||
|
||||
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 JMAP providers - all three share the same service store
|
||||
$this->providerManager->register(ProviderInterface::TYPE_MAIL, 'jmap', MailProvider::class);
|
||||
//$this->providerManager->register(ProviderInterface::TYPE_CHRONO, 'jmap', ChronoProvider::class);
|
||||
@@ -84,10 +74,15 @@ class Module extends ModuleInstanceAbstract
|
||||
$this->providerManager->register(ProviderInterface::TYPE_DOCUMENT, 'jmap', DocumentProvider::class);
|
||||
}
|
||||
|
||||
public function configure(ModuleContextInterface $context): void
|
||||
{
|
||||
if ($context instanceof BrowserModuleContextInterface) {
|
||||
$context->registerModule($this, 'ProviderJmapc', 'static/module.mjs');
|
||||
}
|
||||
public function registerBI(): array {
|
||||
return [
|
||||
'handle' => $this->handle(),
|
||||
'namespace' => 'ProviderJmapc',
|
||||
'version' => $this->version(),
|
||||
'label' => $this->label(),
|
||||
'author' => $this->author(),
|
||||
'description' => $this->description(),
|
||||
'boot' => 'static/module.mjs',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
+51
-138
@@ -102,8 +102,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
||||
],
|
||||
self::CAPABILITY_ENTITY_FETCH => true,
|
||||
self::CAPABILITY_ENTITY_EXTANT => true,
|
||||
self::CAPABILITY_ENTITY_CREATE => true,
|
||||
self::CAPABILITY_ENTITY_MODIFY => true,
|
||||
self::CAPABILITY_ENTITY_CREATE => false,
|
||||
self::CAPABILITY_ENTITY_MODIFY => false,
|
||||
self::CAPABILITY_ENTITY_PATCH => true,
|
||||
self::CAPABILITY_ENTITY_DELETE => true,
|
||||
self::CAPABILITY_ENTITY_MOVE => true,
|
||||
@@ -484,34 +484,17 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
||||
}
|
||||
}
|
||||
|
||||
if ($deleteMode === 'soft') {
|
||||
$targetMailbox = $this->mailService->collectionFetch((string) $target->collection());
|
||||
if ($targetMailbox === null) {
|
||||
throw new \RuntimeException('Collection not found for delete operation');
|
||||
}
|
||||
|
||||
$targetIdentifier = (string) $target->collection();
|
||||
$trashIdentifier = (string) $deleteTargetIdentifier->collection();
|
||||
$parentIdentifier = isset($targetMailbox['parentId'])
|
||||
? (string) $targetMailbox['parentId']
|
||||
: null;
|
||||
|
||||
// JMAP mailbox IDs are opaque, so containment must be determined
|
||||
// from parentId rather than by comparing ID prefixes.
|
||||
if ($targetIdentifier === $trashIdentifier || $parentIdentifier === $trashIdentifier) {
|
||||
$deleteMode = 'hard';
|
||||
}
|
||||
// we need to determine if the folder being deleted is already in the trash
|
||||
if (str_starts_with((string) $target->collection(), (string) $deleteTargetIdentifier?->collection())) {
|
||||
// if so, we should hard delete instead of moving to avoid duplicates in the trash
|
||||
$deleteMode = 'hard';
|
||||
}
|
||||
|
||||
if ($deleteMode === 'soft') {
|
||||
return $this->collectionMove($deleteTargetIdentifier, $target);
|
||||
}
|
||||
|
||||
if ($this->mailService->collectionDestroy((string) $target->collection(), $force) === null) {
|
||||
throw new \RuntimeException("Failed to delete collection: {$target->collection()}");
|
||||
}
|
||||
|
||||
return true;
|
||||
$result = match ($deleteMode) {
|
||||
'soft' => $this->collectionMove($deleteTargetIdentifier, $target),
|
||||
'hard' => $this->mailService->collectionDestroy($target->collection(), $force),
|
||||
};
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function collectionMove(CollectionIdentifier $target, CollectionIdentifier $source): CollectionBaseInterface
|
||||
@@ -638,42 +621,14 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
||||
|
||||
public function entityCreate(CollectionIdentifier $target, MessagePropertiesMutableInterface $properties, array $options = []): EntityResource
|
||||
{
|
||||
if ($target->provider() !== $this->provider() || (string)$target->service() !== (string)$this->identifier()) {
|
||||
throw new \InvalidArgumentException('Target collection does not belong to this service: ' . (string)$target);
|
||||
}
|
||||
|
||||
$this->initialize();
|
||||
|
||||
[$nativeMessage, $nativeAttachments] = $this->messagePayload($properties);
|
||||
|
||||
$created = $this->mailService->entityCreate((string)$target->collection(), $nativeMessage, $nativeAttachments);
|
||||
if ($created === null || !isset($created['id'])) {
|
||||
throw new \RuntimeException('JMAP entity creation did not return an identifier');
|
||||
}
|
||||
$created['mailboxIds'] ??= [(string)$target->collection() => true];
|
||||
|
||||
return $this->entityFresh()->fromJmap($created);
|
||||
// TODO: Implement entity create
|
||||
return $this->entityFresh();
|
||||
}
|
||||
|
||||
public function entityModify(EntityIdentifier $target, MessagePropertiesMutableInterface $properties): EntityResource
|
||||
public function entityModify(EntityIdentifier $identifier, MessagePropertiesMutableInterface $properties): EntityResource
|
||||
{
|
||||
if ($target->provider() !== $this->provider() || (string)$target->service() !== (string)$this->identifier()) {
|
||||
throw new \InvalidArgumentException('Target collection does not belong to this service: ' . (string)$target);
|
||||
}
|
||||
|
||||
$this->initialize();
|
||||
|
||||
[$nativeMessage, $nativeAttachments] = $this->messagePayload($properties);
|
||||
$nativeMessage['id'] = (string)$target->entity();
|
||||
$nativeMessage['mailboxIds'] = [(string)$target->collection() => true];
|
||||
|
||||
// JMAP replaces immutable Email content and returns the new authoritative ID.
|
||||
$modified = $this->mailService->entityReplace($nativeMessage, $nativeAttachments);
|
||||
if ($modified === null) {
|
||||
throw new \RuntimeException('JMAP entity modification failed');
|
||||
}
|
||||
|
||||
return $this->entityFresh()->fromJmap($modified);
|
||||
// TODO: Implement entity modify
|
||||
return $this->entityFresh();
|
||||
}
|
||||
|
||||
public function entityPatch(MessagePropertiesMutableInterface $properties, EntityIdentifier ...$targets): array
|
||||
@@ -925,14 +880,32 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
||||
);
|
||||
}
|
||||
|
||||
[$nativeMessage, $nativeAttachments] = $this->messagePayload($message);
|
||||
$transportId = $this->mailService->entitySubmitFresh(
|
||||
$identityId,
|
||||
$nativeMessage,
|
||||
$preSendTarget->collection(),
|
||||
$postSentTarget->collection(),
|
||||
$nativeAttachments,
|
||||
);
|
||||
$nativeProperties = $this->normalizeMessageProperties($message);
|
||||
$attachments = $nativeProperties->getAttachments();
|
||||
foreach ($attachments as $attachment) {
|
||||
if ($attachment->getBlobId() !== null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$content = $attachment->getContent();
|
||||
if ($content === null) {
|
||||
throw new \InvalidArgumentException(sprintf(
|
||||
'Attachment "%s" has neither content nor a JMAP blob identifier',
|
||||
$attachment->getName() ?? 'unnamed',
|
||||
));
|
||||
}
|
||||
|
||||
$attachment->setBlobId($this->mailService->blobDeposit(
|
||||
$attachment->getType() ?? 'application/octet-stream',
|
||||
$content,
|
||||
));
|
||||
}
|
||||
if ($attachments !== []) {
|
||||
$nativeProperties->setAttachments(...$attachments);
|
||||
}
|
||||
|
||||
$nativeMessage = $nativeProperties->toJmap();
|
||||
$transportId = $this->mailService->entitySubmitFresh($identityId, $nativeMessage, $preSendTarget->collection(), $postSentTarget->collection());
|
||||
|
||||
return new EntitySubmitResult(
|
||||
EntitySubmitResult::DISPOSITION_SENT,
|
||||
@@ -950,38 +923,12 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
||||
);
|
||||
}
|
||||
|
||||
// determine the sent folder
|
||||
// if no explicit sent folder is configured, we will attempt to find a folder with the "sent" role.
|
||||
$postSentTarget = $this->auxiliary['sentTarget'] ?? null;
|
||||
$postSentTarget = $postSentTarget !== null && (string) $postSentTarget !== ''
|
||||
? new CollectionIdentifier($this->provider(), (string) $this->identifier(), (string) $postSentTarget)
|
||||
: $this->resolveCollectionByRole(CollectionRoles::Sent->value);
|
||||
|
||||
if ($postSentTarget === null
|
||||
|| $postSentTarget->provider() !== $this->provider()
|
||||
|| $postSentTarget->service() !== (string)$this->identifier()) {
|
||||
return new EntitySubmitResult(
|
||||
EntitySubmitResult::DISPOSITION_ERROR,
|
||||
errorCode: 'sent_collection_not_found',
|
||||
errorMessage: 'No Sent target collection is configured or could be resolved for this service',
|
||||
);
|
||||
}
|
||||
|
||||
$patch = null;
|
||||
if ($message !== null) {
|
||||
[$nativeMessage, $nativeAttachments] = $this->messagePayload($message);
|
||||
} else {
|
||||
$nativeMessage = null;
|
||||
$nativeAttachments = [];
|
||||
$patch = $this->normalizeMessageProperties($message)->toJmap();
|
||||
}
|
||||
|
||||
$transportId = $this->mailService->entitySubmitDraft(
|
||||
$identityId,
|
||||
(string)$source->entity(),
|
||||
(string)$source->collection(),
|
||||
$postSentTarget->collection(),
|
||||
$nativeMessage,
|
||||
$nativeAttachments,
|
||||
);
|
||||
$transportId = $this->mailService->entitySubmitDraft($identityId, (string)$source->entity(), $patch);
|
||||
|
||||
return new EntitySubmitResult(
|
||||
EntitySubmitResult::DISPOSITION_SENT,
|
||||
@@ -990,50 +937,16 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert message properties and describe attachment blobs for the remote
|
||||
* service. Uploading and request batching remain remote-layer concerns.
|
||||
*
|
||||
* @return array{0: array, 1: array<string, array{type: string, content: string}>}
|
||||
*/
|
||||
private function messagePayload(MessagePropertiesMutableInterface $message): array
|
||||
private function normalizeMessageProperties(MessagePropertiesMutableInterface $message): MessageProperties
|
||||
{
|
||||
if ($message instanceof MessageProperties === false) {
|
||||
$native = new MessageProperties([]);
|
||||
$native->jsonDeserialize($message->jsonSerialize());
|
||||
} else {
|
||||
$native = $message;
|
||||
if ($message instanceof MessageProperties) {
|
||||
return $message;
|
||||
}
|
||||
|
||||
$attachments = $native->getAttachments();
|
||||
$uploads = [];
|
||||
$native = new MessageProperties([]);
|
||||
$native->jsonDeserialize($message->jsonSerialize());
|
||||
|
||||
foreach ($attachments as $attachment) {
|
||||
if ($attachment->getBlobId() !== null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$content = $attachment->getContent();
|
||||
if ($content === null) {
|
||||
throw new \InvalidArgumentException(sprintf(
|
||||
'Attachment "%s" has neither content nor a JMAP blob identifier',
|
||||
$attachment->getName() ?? 'unnamed',
|
||||
));
|
||||
}
|
||||
|
||||
$creationId = 'attachment_' . count($uploads);
|
||||
$attachment->setBlobId('#' . $creationId);
|
||||
$uploads[$creationId] = [
|
||||
'type' => $attachment->getType() ?? 'application/octet-stream',
|
||||
'content' => $content,
|
||||
];
|
||||
}
|
||||
|
||||
if ($attachments !== []) {
|
||||
$native->setAttachments(...$attachments);
|
||||
}
|
||||
|
||||
return [$native->toJmap(), $uploads];
|
||||
return $native;
|
||||
}
|
||||
|
||||
private function resolveCollectionByRole(string $role): ?CollectionIdentifier
|
||||
|
||||
@@ -11,7 +11,6 @@ namespace KTXM\ProviderJmapc\Service\Remote;
|
||||
|
||||
use Exception;
|
||||
use JmapClient\Client;
|
||||
use JmapClient\Requests\Blob\BlobSet;
|
||||
use JmapClient\Requests\Mail\MailboxGet;
|
||||
use JmapClient\Requests\Mail\MailboxParameters as MailboxParametersRequest;
|
||||
use JmapClient\Requests\Mail\MailboxQuery;
|
||||
@@ -728,8 +727,7 @@ class RemoteMailService {
|
||||
*
|
||||
* @since Release 1.0.0
|
||||
*/
|
||||
public function entityCreate(string $location, array $so, array $attachments = []): ?array {
|
||||
$blobRequest = $this->prepareAttachmentRequest($so, $attachments);
|
||||
public function entityCreate(string $location, array $so): ?array {
|
||||
// convert entity
|
||||
$to = new MailParametersRequest();
|
||||
$to->parametersRaw($so);
|
||||
@@ -739,11 +737,9 @@ class RemoteMailService {
|
||||
$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$r0->create($id, $to);
|
||||
// transceive
|
||||
$requests = $blobRequest !== null ? [$blobRequest, $r0] : [$r0];
|
||||
$bundle = $this->dataStore->perform($requests);
|
||||
$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $so);
|
||||
$bundle = $this->dataStore->perform([$r0]);
|
||||
// extract response
|
||||
$response = $bundle->response($blobRequest !== null ? 1 : 0);
|
||||
$response = $bundle->response(0);
|
||||
// check for command error
|
||||
if ($response instanceof ResponseException) {
|
||||
if ($response->type() === 'unknownMethod') {
|
||||
@@ -773,64 +769,27 @@ class RemoteMailService {
|
||||
*
|
||||
* @since Release 1.0.0
|
||||
*/
|
||||
public function entityReplace(array $so, array $attachments = []): ?array {
|
||||
// JMAP Email content is immutable after creation. Replacing a draft must
|
||||
// therefore create a new Email and remove the superseded Email together.
|
||||
$id = (string)($so['id'] ?? '');
|
||||
unset($so['id']);
|
||||
if ($id === '') {
|
||||
throw new Exception('Draft identifier is required for replacement', 1);
|
||||
public function entityModify(array $so): ?array {
|
||||
// extract entity id
|
||||
$id = $so['id'];
|
||||
// convert entity
|
||||
$to = new MailParametersRequest();
|
||||
$to->parametersRaw($so);
|
||||
// construct request
|
||||
$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$r0->update($id, $to);
|
||||
// transceive
|
||||
$bundle = $this->dataStore->perform([$r0]);
|
||||
// extract response
|
||||
$response = $bundle->response(0);
|
||||
// determine if command succeeded
|
||||
if (array_key_exists($id, $response->updated())) {
|
||||
// update entity
|
||||
$ro = $response->updated()[$id];
|
||||
$so = array_merge($so, $ro);
|
||||
return $so;
|
||||
}
|
||||
|
||||
$location = null;
|
||||
foreach (($so['mailboxIds'] ?? []) as $mailboxId => $included) {
|
||||
if ($included === true) {
|
||||
$location = (string)$mailboxId;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($location === null || $location === '') {
|
||||
throw new Exception('Draft mailbox is required for replacement', 1);
|
||||
}
|
||||
|
||||
$blobRequest = $this->prepareAttachmentRequest($so, $attachments);
|
||||
$replacement = new MailParametersRequest();
|
||||
$replacement->parametersRaw($so);
|
||||
$replacement->in($location);
|
||||
$creationId = uniqid();
|
||||
|
||||
// Email/set supports create and destroy in one method call. When attachment
|
||||
// content is present, Blob/upload is included in the same HTTP request.
|
||||
$request = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$request->create($creationId, $replacement);
|
||||
$request->delete($id);
|
||||
$requests = $blobRequest !== null ? [$blobRequest, $request] : [$request];
|
||||
$bundle = $this->dataStore->perform($requests);
|
||||
$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $so);
|
||||
$response = $bundle->response($blobRequest !== null ? 1 : 0);
|
||||
|
||||
if ($response instanceof ResponseException) {
|
||||
if ($response->type() === 'unknownMethod') {
|
||||
throw new JmapUnknownMethod($response->description(), 1);
|
||||
}
|
||||
throw new Exception($response->type() . ': ' . $response->description(), 1);
|
||||
}
|
||||
|
||||
$created = $response->createSuccess($creationId);
|
||||
if ($created === null) {
|
||||
$failure = $response->createFailure($creationId);
|
||||
$type = $failure['type'] ?? 'unknownError';
|
||||
$description = $failure['description'] ?? 'JMAP draft replacement failed.';
|
||||
throw new Exception("$type: $description", 1);
|
||||
}
|
||||
if ($response->deleteSuccess($id) === null) {
|
||||
$failure = $response->deleteFailure($id);
|
||||
$type = $failure['type'] ?? 'unknownError';
|
||||
$description = $failure['description'] ?? 'The superseded JMAP draft could not be deleted.';
|
||||
throw new Exception("$type: $description", 1);
|
||||
}
|
||||
|
||||
return array_merge($so, $created);
|
||||
return null;
|
||||
}
|
||||
|
||||
public function entityPatch(MailParametersRequest $properties, string ...$identifiers): ?array {
|
||||
@@ -953,8 +912,7 @@ class RemoteMailService {
|
||||
*
|
||||
* @since Release 2.0.0
|
||||
*/
|
||||
public function entitySubmitFresh(string $identityId, array $data, string $preSendTarget, string $postSentTarget, array $attachments = []): string {
|
||||
$blobRequest = $this->prepareAttachmentRequest($data, $attachments);
|
||||
public function entitySubmitFresh(string $identityId, array $data, string $preSendTarget, string $postSentTarget): string {
|
||||
|
||||
$message = new MailParametersRequest();
|
||||
$message->parametersRaw($data);
|
||||
@@ -978,11 +936,8 @@ class RemoteMailService {
|
||||
$s0->identity($identityId);
|
||||
$s0->message('#' . $messageId);
|
||||
|
||||
$requests = $blobRequest !== null ? [$blobRequest, $r0, $r1] : [$r0, $r1];
|
||||
$bundle = $this->dataStore->perform($requests);
|
||||
$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $data);
|
||||
$responseOffset = $blobRequest !== null ? 1 : 0;
|
||||
$messageResponse = $bundle->response($responseOffset);
|
||||
$bundle = $this->dataStore->perform([$r0, $r1]);
|
||||
$messageResponse = $bundle->response(0);
|
||||
if ($messageResponse instanceof ResponseException) {
|
||||
throw new Exception($messageResponse->type() . ': ' . $messageResponse->description(), 1);
|
||||
}
|
||||
@@ -995,59 +950,7 @@ class RemoteMailService {
|
||||
}
|
||||
}
|
||||
|
||||
$response = $bundle->response($responseOffset + 1);
|
||||
if ($response instanceof ResponseException) {
|
||||
if ($response->type() === 'unknownMethod') {
|
||||
throw new JmapUnknownMethod($response->description(), 1);
|
||||
}
|
||||
throw new Exception($response->type() . ': ' . $response->description(), 1);
|
||||
}
|
||||
|
||||
return $this->extractSubmissionIdentifier($response, $submissionId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Submit an existing draft message. On success, the draft Email is moved
|
||||
* from the drafts mailbox to the sent mailbox and its \Draft keyword is
|
||||
* cleared in the same request, so the submitted draft becomes the sent
|
||||
* copy rather than lingering as an unsent draft.
|
||||
*
|
||||
* @since Release 2.0.0
|
||||
*/
|
||||
public function entitySubmitDraft(string $identityId, string $draftId, string $preSendTarget, string $postSentTarget, ?array $patch = null, array $attachments = []): string {
|
||||
if ($draftId === '') {
|
||||
throw new Exception('Draft identifier is required for draft submission', 1);
|
||||
}
|
||||
|
||||
$blobRequest = $patch !== null ? $this->prepareAttachmentRequest($patch, $attachments) : null;
|
||||
$requests = $blobRequest !== null ? [$blobRequest] : [];
|
||||
|
||||
if ($patch !== null && $patch !== []) {
|
||||
$m0 = new MailParametersRequest();
|
||||
$m0->parametersRaw($patch);
|
||||
$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$r0->update($draftId, $m0);
|
||||
$requests[] = $r0;
|
||||
}
|
||||
|
||||
$submissionId = 's_' . uniqid();
|
||||
$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$r1->completionUpdate($draftId, [
|
||||
'mailboxIds/' . $postSentTarget => true,
|
||||
'mailboxIds/' . $preSendTarget => null,
|
||||
'keywords/$draft' => null,
|
||||
]);
|
||||
$s0 = $r1->create($submissionId);
|
||||
$s0->identity($identityId);
|
||||
$s0->message($draftId);
|
||||
$requests[] = $r1;
|
||||
|
||||
$bundle = $this->dataStore->perform($requests);
|
||||
if ($patch !== null) {
|
||||
$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $patch);
|
||||
}
|
||||
$responseIndex = count($requests) - 1;
|
||||
$response = $bundle->response($responseIndex);
|
||||
$response = $bundle->response(1);
|
||||
if ($response instanceof ResponseException) {
|
||||
if ($response->type() === 'unknownMethod') {
|
||||
throw new JmapUnknownMethod($response->description(), 1);
|
||||
@@ -1071,78 +974,43 @@ class RemoteMailService {
|
||||
}
|
||||
|
||||
/**
|
||||
* Build one Blob/upload method call for all new attachment content. Servers
|
||||
* without the Blob capability fall back to the standard upload endpoint.
|
||||
* Submit an existing draft message.
|
||||
*
|
||||
* @param array<string, array{type: string, content: string}> $attachments
|
||||
* @since Release 2.0.0
|
||||
*/
|
||||
private function prepareAttachmentRequest(array &$data, array $attachments): ?BlobSet {
|
||||
if ($attachments === []) {
|
||||
return null;
|
||||
public function entitySubmitDraft(string $identityId, string $draftId, ?array $patch = null): string {
|
||||
if ($draftId === '') {
|
||||
throw new Exception('Draft identifier is required for draft submission', 1);
|
||||
}
|
||||
|
||||
if (!$this->dataStore->sessionCapable('blob')) {
|
||||
foreach ($attachments as $creationId => $attachment) {
|
||||
$blobId = $this->blobDeposit($attachment['type'], $attachment['content']);
|
||||
$this->replaceBlobReference($data, '#' . $creationId, $blobId);
|
||||
}
|
||||
return null;
|
||||
$requests = [];
|
||||
|
||||
if ($patch !== null && $patch !== []) {
|
||||
$m0 = new MailParametersRequest();
|
||||
$m0->parametersRaw($patch);
|
||||
$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$r0->update($draftId, $m0);
|
||||
$requests[] = $r0;
|
||||
}
|
||||
|
||||
$request = new BlobSet($this->dataAccount);
|
||||
foreach ($attachments as $creationId => $attachment) {
|
||||
$request->create($creationId)
|
||||
->type($attachment['type'])
|
||||
->dataEncoded(base64_encode($attachment['content']));
|
||||
}
|
||||
$submissionId = 's_' . uniqid();
|
||||
$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
|
||||
$s0 = $r1->create($submissionId);
|
||||
$s0->identity($identityId);
|
||||
$s0->message($draftId);
|
||||
$requests[] = $r1;
|
||||
|
||||
return $request;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a batched Blob/upload response and replace creation references
|
||||
* in the returned local representation with actual server blob IDs.
|
||||
*
|
||||
* @param array<string, array{type: string, content: string}> $attachments
|
||||
*/
|
||||
private function assertAttachmentUploads(object $bundle, ?BlobSet $request, array $attachments, array &$data): void {
|
||||
if ($request === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$response = $bundle->response(0);
|
||||
$bundle = $this->dataStore->perform($requests);
|
||||
$responseIndex = count($requests) - 1;
|
||||
$response = $bundle->response($responseIndex);
|
||||
if ($response instanceof ResponseException) {
|
||||
throw new Exception('Attachment upload failed: ' . $response->type() . ': ' . $response->description(), 1);
|
||||
if ($response->type() === 'unknownMethod') {
|
||||
throw new JmapUnknownMethod($response->description(), 1);
|
||||
}
|
||||
throw new Exception($response->type() . ': ' . $response->description(), 1);
|
||||
}
|
||||
|
||||
foreach (array_keys($attachments) as $creationId) {
|
||||
$failure = $response->createFailure($creationId);
|
||||
if ($failure !== null) {
|
||||
$type = $failure['type'] ?? 'unknownError';
|
||||
$description = $failure['description'] ?? 'Attachment upload failed.';
|
||||
throw new Exception("$type: $description", 1);
|
||||
}
|
||||
|
||||
$success = $response->createSuccess($creationId);
|
||||
$blobId = is_array($success) ? ($success['id'] ?? null) : null;
|
||||
if (!is_string($blobId) || $blobId === '') {
|
||||
throw new Exception('Attachment upload did not return a blob identifier', 1);
|
||||
}
|
||||
$this->replaceBlobReference($data, '#' . $creationId, $blobId);
|
||||
}
|
||||
}
|
||||
|
||||
private function replaceBlobReference(array &$data, string $reference, string $blobId): void {
|
||||
foreach ($data as &$value) {
|
||||
if (is_array($value)) {
|
||||
$this->replaceBlobReference($value, $reference, $blobId);
|
||||
continue;
|
||||
}
|
||||
if ($value === $reference) {
|
||||
$value = $blobId;
|
||||
}
|
||||
}
|
||||
unset($value);
|
||||
return $this->extractSubmissionIdentifier($response, $submissionId);
|
||||
}
|
||||
|
||||
private function extractSubmissionIdentifier(object $response, string $createId): string {
|
||||
|
||||
@@ -73,7 +73,7 @@ class RemoteService {
|
||||
}
|
||||
// debugging
|
||||
if ($service->getDebug()) {
|
||||
$logDirectory = dirname(__DIR__, 5) . '/var/logs/provider_jmap';
|
||||
$logDirectory = dirname(__DIR__, 5) . '/var/logs/jmap';
|
||||
if (!is_dir($logDirectory) && !mkdir($logDirectory, 0775, true) && !is_dir($logDirectory)) {
|
||||
throw new \RuntimeException(sprintf('Unable to create JMAP log directory: %s', $logDirectory));
|
||||
}
|
||||
|
||||
@@ -176,15 +176,4 @@ 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,
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user