fix: folder deletion while in trash

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

.github/workflows/php-integration-tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mongo:
-        image: mongo:7
+        image: mongo:8
         options: >-
           --health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
           --health-interval 5s

lib/Providers/Mail/Provider.php

@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderJmapc\Providers\Mail;
 
+use KTXF\Mail\Object\Address;
 use KTXF\Mail\Provider\ProviderBaseInterface;
 use KTXF\Mail\Provider\ProviderServiceDiscoverInterface;
 use KTXF\Mail\Provider\ProviderServiceMutateInterface;
@@ -142,9 +143,66 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
         }
 
         $created = $this->serviceStore->create($tenantId, $userId, $service);
+        $this->serviceIdentitiesSync($tenantId, $userId, (new Service())->fromStore($created));
         return (string) $created['sid'];
     }
 
+    /**
+     * Fetches sending identities from the JMAP server and overwrites
+     * primaryAddress/secondaryAddresses on the service with them.
+     */
+    private function serviceIdentitiesSync(string $tenantId, string $userId, Service $service): void
+    {
+        try {
+            $client = RemoteService::freshClient($service);
+            $identities = RemoteService::mailService($client)->identityFetch();
+
+            // A JMAP server may expose multiple identities sharing the same
+            // address (e.g. distinct signatures/display names for one
+            // mailbox) — collapse those down to one entry per address,
+            // keeping the first label seen.
+            $addresses = [];
+            foreach ($identities as $identity) {
+                if ($identity->address() === null) {
+                    continue;
+                }
+                $key = strtolower($identity->address());
+                if (!isset($addresses[$key])) {
+                    $addresses[$key] = Address::fromArray(['address' => $identity->address(), 'label' => $identity->name()]);
+                }
+            }
+            $addresses = array_values($addresses);
+
+            if (empty($addresses)) {
+                return;
+            }
+
+            $currentAddress = strtolower($service->getPrimaryAddress()->getAddress());
+            $primaryIndex = 0;
+            foreach ($addresses as $index => $address) {
+                if (strtolower($address->getAddress()) === $currentAddress) {
+                    $primaryIndex = $index;
+                    break;
+                }
+            }
+
+            $secondary = [];
+            foreach ($addresses as $index => $address) {
+                if ($index !== $primaryIndex) {
+                    $secondary[] = $address;
+                }
+            }
+
+            $service->setPrimaryAddress($addresses[$primaryIndex]);
+            $service->setSecondaryAddresses($secondary);
+
+            $this->serviceStore->modify($tenantId, $userId, $service);
+        } catch (\Throwable) {
+            // Server may not support urn:ietf:params:jmap:submission, or have
+            // no identities configured — fall back to what the user entered.
+        }
+    }
+
     public function serviceModify(string $tenantId, string $userId, ResourceServiceMutateInterface $service): string
     {
         if (!($service instanceof Service)) {
@@ -152,6 +210,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
         }
 
         $this->serviceStore->modify($tenantId, $userId, $service);
+        $this->serviceIdentitiesSync($tenantId, $userId, $service);
         return (string) $service->identifier();
     }
 

lib/Providers/Mail/Service.php

@@ -206,8 +206,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])) {
-            $this->setPrimaryAddress(new Address($data[self::PROPERTY_PRIMARY_ADDRESS]));
+        if (isset($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(
@@ -483,17 +484,34 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             }
         }
 
-        // 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') {
+            $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';
+            }
         }
 
-        $result = match ($deleteMode) {
-            'soft' => $this->collectionMove($deleteTargetIdentifier, $target),
-            'hard' => $this->mailService->collectionDestroy($target->collection(), $force),
-        };
-        return $result;
+        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;
     }
 
     public function collectionMove(CollectionIdentifier $target, CollectionIdentifier $source): CollectionBaseInterface
@@ -879,7 +897,31 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             );
         }
 
-        $nativeMessage = $this->normalizeMessageProperties($message)->toJmap();
+        $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(

lib/Providers/People/PeopleProvider.php

@@ -97,7 +97,7 @@ class Provider implements IProviderBase, IProviderServiceMutate
         }
 
         // Note: This simplified interface doesn't pass tenantId
-        // Will need to get it from SessionTenant in actual implementation
+        // Will need to get it from TenantContextInterface in actual implementation
         throw new \RuntimeException('Use Mail Provider interface for service creation');
     }
 

lib/Service/Remote/RemoteMailService.php

@@ -912,23 +912,44 @@ class RemoteMailService {
 	 *
 	 * @since Release 2.0.0
 	 */
-	public function entitySubmitFresh(string $identityId, array $message, string $preSendTarget, string $postSentTarget): string {
+	public function entitySubmitFresh(string $identityId, array $data, string $preSendTarget, string $postSentTarget): string {
 
-		$mail = new MailParametersRequest();
-		$mail->parametersRaw($message);
+		$message = new MailParametersRequest();
+		$message->parametersRaw($data);
 
-		$messageCreateId = 'm_' . uniqid();
-		$submissionCreateId = 's_' . uniqid();
+		$messageId = 'm_' . uniqid();
+		$submissionId = 's_' . uniqid();
 
 		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$createdMessage = $r0->create($messageCreateId, $mail);
-		$createdMessage->in($preSendTarget);
+		$m0 = $r0->create($messageId, $message);
+		$m0->in($preSendTarget);
+		$m0->draft(true);
+		$m0->seen(true);
+
 		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$submission = $r1->create($submissionCreateId);
-		$submission->identity($identityId);
-		$submission->message('#' . $messageCreateId);
+		$r1->completionUpdate('#' . $messageId, [
+			'mailboxIds/' . $postSentTarget => true,
+			'mailboxIds/' . $preSendTarget => null,
+			'keywords/$draft' => null,
+		]);
+		$s0 = $r1->create($submissionId);
+		$s0->identity($identityId);
+		$s0->message('#' . $messageId);
 
 		$bundle = $this->dataStore->perform([$r0, $r1]);
+		$messageResponse = $bundle->response(0);
+		if ($messageResponse instanceof ResponseException) {
+			throw new Exception($messageResponse->type() . ': ' . $messageResponse->description(), 1);
+		}
+		if (method_exists($messageResponse, 'createFailure')) {
+			$failure = $messageResponse->createFailure($messageId);
+			if (is_array($failure)) {
+				$type = $failure['type'] ?? 'unknownError';
+				$description = $failure['description'] ?? 'Email creation failed';
+				throw new Exception($type . ': ' . $description, 1);
+			}
+		}
+
 		$response = $bundle->response(1);
 		if ($response instanceof ResponseException) {
 			if ($response->type() === 'unknownMethod') {
@@ -937,7 +958,19 @@ class RemoteMailService {
 			throw new Exception($response->type() . ': ' . $response->description(), 1);
 		}
 
-		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
+		return $this->extractSubmissionIdentifier($response, $submissionId);
+	}
+
+	/**
+	 * Upload attachment content and return its JMAP blob identifier.
+	 */
+	public function blobDeposit(string $type, string $data): string {
+		$response = json_decode($this->dataStore->upload($this->dataAccount, $type, $data), true);
+		if (!is_array($response) || !isset($response['blobId']) || !is_string($response['blobId']) || $response['blobId'] === '') {
+			throw new Exception('JMAP attachment upload did not return a blob identifier', 1);
+		}
+
+		return $response['blobId'];
 	}
 
 	/**
@@ -953,18 +986,18 @@ class RemoteMailService {
 		$requests = [];
 
 		if ($patch !== null && $patch !== []) {
-			$draftMutation = new MailParametersRequest();
-			$draftMutation->parametersRaw($patch);
+			$m0 = new MailParametersRequest();
+			$m0->parametersRaw($patch);
 			$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-			$r0->update($draftId, $draftMutation);
+			$r0->update($draftId, $m0);
 			$requests[] = $r0;
 		}
 
-		$submissionCreateId = 's_' . uniqid();
+		$submissionId = 's_' . uniqid();
 		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$submission = $r1->create($submissionCreateId);
-		$submission->identity($identityId);
-		$submission->message($draftId);
+		$s0 = $r1->create($submissionId);
+		$s0->identity($identityId);
+		$s0->message($draftId);
 		$requests[] = $r1;
 
 		$bundle = $this->dataStore->perform($requests);
@@ -977,19 +1010,7 @@ class RemoteMailService {
 			throw new Exception($response->type() . ': ' . $response->description(), 1);
 		}
 
-		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
-	}
-
-	private function collectionByRole(string $role): ?string {
-		$filter = $this->collectionListFilter();
-		$filter->condition('role', $role);
-
-		$collections = $this->collectionList(null, $filter, null);
-		if ($collections === []) {
-			return null;
-		}
-
-		return (string)array_key_first($collections);
+		return $this->extractSubmissionIdentifier($response, $submissionId);
 	}
 
 	private function extractSubmissionIdentifier(object $response, string $createId): string {

lib/Service/Remote/RemoteService.php

@@ -13,7 +13,7 @@ use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Psr7\HttpFactory;
 use JmapClient\Authentication\Basic;
 use JmapClient\Client as JmapClient;
-use KTXC\Server;
+use KTXF\Security\Crypto;
 use KTXF\Resource\Provider\ResourceServiceIdentityBasic;
 use KTXF\Resource\Provider\ResourceServiceLocationUri;
 use KTXM\ProviderJmapc\Providers\Mail\Service as MailService;
@@ -73,10 +73,13 @@ class RemoteService {
 		}
 		// debugging
 		if ($service->getDebug()) {
-			$logDir = Server::getInstance()?->logDir();
-			$logDir .= '/jmap/' . $service->identifier() . '.json';
+			$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));
+			}
+			$logFile = $logDirectory . '/' . $service->identifier() . '.json';
 			$client->configureTransportLogState(true);
-			$client->configureTransportLogLocation($logDir);
+			$client->configureTransportLogLocation($logFile);
 		}
 		// return
 		return $client;
@@ -200,7 +203,7 @@ class RemoteService {
 		return $service;
 	}
 
-	public static function cookieStoreRetrieve(mixed $id): ?array {
+	public static function cookieStoreRetrieve(mixed $id, Crypto $crypto): ?array {
 
 		$file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . (string)$id . '.jmapc';
 
@@ -209,7 +212,6 @@ class RemoteService {
 		}
 
 		$data = file_get_contents($file);
-		$crypto = Server::getInstance()->container()->get(\KTXF\Security\Crypto::class);
 		$data = $crypto->decrypt($data);
 
 		if (!empty($data)) {
@@ -220,13 +222,12 @@ class RemoteService {
 
 	}
 
-	public static function cookieStoreDeposit(mixed $id, array $value): void {
+	public static function cookieStoreDeposit(mixed $id, array $value, Crypto $crypto): void {
 
 		if (empty($value)) {
 			return;
 		}
 
-		$crypto = Server::getInstance()->container()->get(\KTXF\Security\Crypto::class);
 		$data = $crypto->encrypt(json_encode($value));
 
 		$file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . (string)$id . '.jmapc';

package.json

@@ -18,7 +18,7 @@
     "test:coverage": "vitest run --coverage --config tests/js/vitest.config.ts"
   },
   "dependencies": {
-    "pinia": "^3.0.0",
+    "pinia": "^4.0.0",
     "vue": "^3.5.18",
     "vue-router": "^5.0.0",
     "vuetify": "^4.0.0"

src/components/JmapAuthPanel.vue

@@ -274,7 +274,7 @@ async function initiateOAuth() {
         variant="outlined"
         prepend-inner-icon="mdi-account"
         class="mb-4"
-        autocomplete="username"
+        autocomplete="off"
         autocorrect="off"
         autocapitalize="none"
         :rules="[rules.required]"
@@ -289,7 +289,7 @@ async function initiateOAuth() {
         variant="outlined"
         prepend-inner-icon="mdi-lock"
         class="mb-4"
-        autocomplete="current-password"
+        autocomplete="new-password"
         :rules="[rules.required]"
       />
     </template>

src/components/JmapAuxiliaryPanel.vue

@@ -25,7 +25,7 @@ const settingGroups = [
     title: 'Addresses',
     value: 'addresses' as const,
     icon: 'mdi-at',
-    description: 'Configure the primary mailbox identity and any sender aliases exposed by this service.'
+    description: 'View the primary mailbox identity and sender aliases synced from the JMAP server.'
   },
   {
     title: 'Messages',
@@ -71,7 +71,7 @@ watch(
 )
 
 watch(
-  [deleteMode, deleteDestination, primaryAddress, secondaryAddresses],
+  [deleteMode, deleteDestination],
   () => {
     const nextService = props.service ?? new ServiceObject()
     const nextAuxiliary = {
@@ -83,13 +83,9 @@ watch(
     }
 
     if (sameAuxiliary(nextService.auxiliary ?? {}, nextAuxiliary)) {
-      if (sameAddresses(nextService)) {
-        return
-      }
+      return
     }
 
-    nextService.primaryAddress = primaryAddress.value.empty ? null : primaryAddress.value
-    nextService.secondaryAddresses = dedupeAddresses(secondaryAddresses.value)
     nextService.auxiliary = nextAuxiliary
     emit('update:service', nextService)
   },
@@ -111,44 +107,10 @@ function normalizeDeleteDestination(value: string): string {
   return trimmedValue.length > 0 ? trimmedValue : 'Trash'
 }
 
-function dedupeAddresses(entries: ServiceAddressObject[]): ServiceAddressObject[] {
-  const populated = entries.filter(entry => !entry.empty)
-  return populated.filter((entry, index) =>
-    populated.findIndex(candidate => candidate.matches(entry.address)) === index)
-}
-
-function addSecondaryAddress() {
-  secondaryAddresses.value.push(new ServiceAddressObject())
-}
-
-function removeSecondaryAddress(index: number) {
-  secondaryAddresses.value.splice(index, 1)
-}
-
-function validAddress(value: string): boolean | string {
-  const trimmedValue = value.trim()
-  return trimmedValue.length === 0 || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(trimmedValue) || 'Invalid email address'
-}
-
 function sameAuxiliary(current: Record<string, any>, next: Record<string, any>): boolean {
   return (current.deleteMode === 'hard' ? 'hard' : 'soft') === next.deleteMode
     && (current.deleteDestination ?? undefined) === (next.deleteDestination ?? undefined)
 }
-
-function sameAddresses(service: ServiceObject): boolean {
-  const nextPrimary = primaryAddress.value.empty ? null : primaryAddress.value
-  const nextSecondary = dedupeAddresses(secondaryAddresses.value)
-  return sameAddress(service.primaryAddress, nextPrimary)
-    && service.secondaryAddresses.length === nextSecondary.length
-    && service.secondaryAddresses.every((entry, index) => sameAddress(entry, nextSecondary[index]))
-}
-
-function sameAddress(current: ServiceAddressObject | null, next: ServiceAddressObject | null): boolean {
-  if (current === null || next === null) {
-    return current === next
-  }
-  return current.equals(next)
-}
 </script>
 
 <template>
@@ -176,69 +138,57 @@ function sameAddress(current: ServiceAddressObject | null, next: ServiceAddressO
           <div class="jmap-settings-card">
             <h3 class="text-h6 mb-2">Addresses</h3>
             <p class="text-body-2 text-medium-emphasis mb-6">
-              Configure the primary mailbox identity and any additional sender aliases exposed by this service.
+              The primary mailbox identity and sender aliases are managed by the JMAP server and synced automatically.
             </p>
 
             <div class="text-subtitle-2 mb-2">Primary Address</div>
             <div class="d-flex ga-2 mb-6">
               <v-text-field
-                v-model="primaryAddress.label"
+                :model-value="primaryAddress.label"
                 label="Display Name"
                 variant="outlined"
                 density="compact"
                 hide-details="auto"
+                readonly
               />
               <v-text-field
-                v-model="primaryAddress.address"
+                :model-value="primaryAddress.address"
                 label="Email Address"
                 variant="outlined"
                 density="compact"
                 prepend-inner-icon="mdi-email-outline"
-                :rules="[validAddress]"
                 hide-details="auto"
+                readonly
               />
             </div>
 
             <div class="text-subtitle-2 mb-2">Secondary Addresses</div>
+            <p v-if="secondaryAddresses.length === 0" class="text-body-2 text-medium-emphasis">
+              No aliases reported by the server.
+            </p>
             <div
               v-for="(entry, index) in secondaryAddresses"
               :key="index"
               class="d-flex ga-2 mb-2"
             >
               <v-text-field
-                v-model="entry.label"
+                :model-value="entry.label"
                 label="Display Name"
                 variant="outlined"
                 density="compact"
                 hide-details="auto"
+                readonly
               />
               <v-text-field
-                v-model="entry.address"
+                :model-value="entry.address"
                 label="Email Address"
                 variant="outlined"
                 density="compact"
                 prepend-inner-icon="mdi-email-multiple-outline"
-                :rules="[validAddress]"
                 hide-details="auto"
+                readonly
               />
-              <v-btn
-                icon
-                size="small"
-                variant="text"
-                @click="removeSecondaryAddress(index)"
-              >
-                <v-icon>mdi-delete-outline</v-icon>
-                <v-tooltip activator="parent" location="bottom">Remove Alias</v-tooltip>
-              </v-btn>
             </div>
-
-            <v-btn
-              variant="tonal"
-              prepend-icon="mdi-plus"
-              @click="addSecondaryAddress"
-            >
-              Add Alias
-            </v-btn>
           </div>
         </v-window-item>