fix(deps): update dependency guzzlehttp/guzzle to v8

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

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

composer.json

@@ -25,7 +25,7 @@
     }
   ],
   "require": {
-    "guzzlehttp/guzzle": "^7.0",
+    "guzzlehttp/guzzle": "^8.0",
     "guzzlehttp/psr7": "^2.0",
     "php": ">=8.3 <=8.5",
     "sebastiankrupinski/jmap-client-php": "dev-main"

composer.lock

@@ -1442,16 +1442,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.5.33",
+            "version": "12.5.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184"
+                "reference": "0608d157a284f15cc73b99a3327eff06b66a176d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
-                "reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0608d157a284f15cc73b99a3327eff06b66a176d",
+                "reference": "0608d157a284f15cc73b99a3327eff06b66a176d",
                 "shasum": ""
             },
             "require": {
@@ -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.33"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.31"
             },
             "funding": [
                 {
@@ -1528,7 +1528,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2026-07-28T13:58:09+00:00"
+            "time": "2026-07-06T14:54:16+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2556,5 +2556,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }

lib/Providers/Mail/Provider.php

@@ -9,7 +9,6 @@ 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;
@@ -143,66 +142,9 @@ 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)) {
@@ -210,7 +152,6 @@ 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,9 +206,8 @@ 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])) {
-            $value = $data[self::PROPERTY_PRIMARY_ADDRESS];
-            $this->setPrimaryAddress(is_array($value) ? Address::fromArray($value) : new Address((string)$value));
+        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_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
             $this->setSecondaryAddresses(array_map(
@@ -880,31 +879,7 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             );
         }
 
-        $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();
+        $nativeMessage = $this->normalizeMessageProperties($message)->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 TenantContextInterface in actual implementation
+        // Will need to get it from SessionTenant in actual implementation
         throw new \RuntimeException('Use Mail Provider interface for service creation');
     }
 

lib/Service/Remote/RemoteMailService.php

@@ -929,19 +929,6 @@ class RemoteMailService {
 		$submission->message('#' . $messageCreateId);
 
 		$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($messageCreateId);
-			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') {
@@ -953,18 +940,6 @@ class RemoteMailService {
 		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
 	}
 
-	/**
-	 * 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'];
-	}
-
 	/**
 	 * Submit an existing draft message.
 	 *

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

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
-        "pinia": "^4.0.0",
+        "pinia": "^3.0.0",
         "vue": "^3.5.18",
         "vue-router": "^5.0.0",
         "vuetify": "^4.0.0"
@@ -71,13 +71,11 @@
       "license": "MIT"
     },
     "node_modules/@babel/generator": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz",
-      "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==",
+      "version": "8.0.0-rc.5",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^8.0.0",
-        "@babel/types": "^8.0.0",
+        "@babel/parser": "^8.0.0-rc.5",
+        "@babel/types": "^8.0.0-rc.5",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "@types/jsesc": "^2.5.0",
@@ -88,30 +86,24 @@
       }
     },
     "node_modules/@babel/generator/node_modules/@babel/helper-string-parser": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz",
-      "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==",
+      "version": "8.0.0-rc.5",
       "license": "MIT",
       "engines": {
         "node": "^22.18.0 || >=24.11.0"
       }
     },
     "node_modules/@babel/generator/node_modules/@babel/helper-validator-identifier": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.4.tgz",
-      "integrity": "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==",
+      "version": "8.0.0-rc.5",
       "license": "MIT",
       "engines": {
         "node": "^22.18.0 || >=24.11.0"
       }
     },
     "node_modules/@babel/generator/node_modules/@babel/parser": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz",
-      "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==",
+      "version": "8.0.0-rc.5",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^8.0.4"
+        "@babel/types": "^8.0.0-rc.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -121,13 +113,11 @@
       }
     },
     "node_modules/@babel/generator/node_modules/@babel/types": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.4.tgz",
-      "integrity": "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==",
+      "version": "8.0.0-rc.5",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^8.0.0",
-        "@babel/helper-validator-identifier": "^8.0.4"
+        "@babel/helper-string-parser": "^8.0.0-rc.5",
+        "@babel/helper-validator-identifier": "^8.0.0-rc.5"
       },
       "engines": {
         "node": "^22.18.0 || >=24.11.0"
@@ -548,6 +538,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -564,6 +557,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -580,6 +576,9 @@
       "cpu": [
         "ppc64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -596,6 +595,9 @@
       "cpu": [
         "s390x"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -610,6 +612,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -624,6 +629,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -743,9 +751,7 @@
       "license": "MIT"
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.8.tgz",
-      "integrity": "sha512-0ZjgOg7oO6farnNGup7yvoM/YXZV84OZxHAwtflItNa/6zzQyVb5LNxyea3FEKEX2XlagIKzrlH7wwxkKgtiew==",
+      "version": "6.0.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -939,9 +945,7 @@
       }
     },
     "node_modules/@vue-macros/common": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vue-macros/common/-/common-3.1.4.tgz",
-      "integrity": "sha512-/5Fv+6DgIcM9ajY05ZmKBv+LMX1M9A0X+IUwDRVdt67ciw8OV9bvG2r34p3RiEadlsQybjhKPRKNXDC8Bp23cw==",
+      "version": "3.1.2",
       "license": "MIT",
       "dependencies": {
         "@vue/compiler-sfc": "^3.5.22",
@@ -1008,42 +1012,52 @@
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.1.5.tgz",
-      "integrity": "sha512-YJipMVAKe5wT5CWf5kTYCaNV7NMNjFVxJkIkJaJ4W/nCxEBzlZzrOsYKeCymdCrFZmBS/+wTWFoUs3Jf/Q6XSQ==",
+      "version": "8.1.2",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-kit": "^8.1.5"
+        "@vue/devtools-kit": "^8.1.2"
       }
     },
     "node_modules/@vue/devtools-api/node_modules/@vue/devtools-kit": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.5.tgz",
-      "integrity": "sha512-FcSAxsi4eWuXLCB7Rv9lj0aIVHHPNVQ2BazGf4RJTc2JCqb4BQg0hk87ZFhminCfl+mD5OUI0rX2cgyu4kJOGA==",
+      "version": "8.1.2",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-shared": "^8.1.5",
+        "@vue/devtools-shared": "^8.1.2",
         "birpc": "^2.6.1",
         "hookable": "^5.5.3",
         "perfect-debounce": "^2.0.0"
       }
     },
     "node_modules/@vue/devtools-api/node_modules/@vue/devtools-shared": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.5.tgz",
-      "integrity": "sha512-mhT4zcPFhF+Xk1O4BfhhrbXzpmfqY03fS6xGpcllbQG7lDjhQf8pQHcTIhqQIYx1hfwtHmk/6jM96ele0UxPqQ==",
+      "version": "8.1.2",
       "license": "MIT"
     },
     "node_modules/@vue/devtools-api/node_modules/perfect-debounce": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
-      "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
       "license": "MIT"
     },
+    "node_modules/@vue/devtools-kit": {
+      "version": "7.7.9",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-shared": "^7.7.9",
+        "birpc": "^2.3.0",
+        "hookable": "^5.5.3",
+        "mitt": "^3.0.1",
+        "perfect-debounce": "^1.0.0",
+        "speakingurl": "^14.0.1",
+        "superjson": "^2.2.2"
+      }
+    },
+    "node_modules/@vue/devtools-shared": {
+      "version": "7.7.9",
+      "license": "MIT",
+      "dependencies": {
+        "rfdc": "^1.4.1"
+      }
+    },
     "node_modules/@vue/language-core": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.8.tgz",
-      "integrity": "sha512-ieGT8jJdhhy0mGzStZhsg/qPw5bQZJg5yF+3+XU6saf4sM7yo9ZXy3h+nCwrm2+b4qS/SypkNdR2jAF3uei9tA==",
+      "version": "3.3.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1323,6 +1337,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/copy-anything": {
+      "version": "4.0.5",
+      "license": "MIT",
+      "dependencies": {
+        "is-what": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "dev": true,
@@ -1554,6 +1581,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/is-what": {
+      "version": "5.5.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "dev": true,
@@ -1830,6 +1867,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1850,6 +1890,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1868,6 +1911,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1886,6 +1932,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1940,9 +1989,7 @@
       }
     },
     "node_modules/local-pkg": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.2.1.tgz",
-      "integrity": "sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==",
+      "version": "1.1.2",
       "license": "MIT",
       "dependencies": {
         "mlly": "^1.7.4",
@@ -2035,6 +2082,10 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "license": "MIT"
+    },
     "node_modules/mlly": {
       "version": "1.8.2",
       "license": "MIT",
@@ -2100,12 +2151,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/nostics": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/nostics/-/nostics-1.2.0.tgz",
-      "integrity": "sha512-FGqEfhQjrvo1lL8KFifdTQiNwwQHJxC1jtYE1Rc54qF/jxONUNL+kC9gS1krX8Q65PgrQ5fCqH/I4NhWBvdSqg==",
-      "license": "MIT"
-    },
     "node_modules/obug": {
       "version": "2.1.1",
       "dev": true,
@@ -2179,6 +2224,10 @@
       "version": "2.0.3",
       "license": "MIT"
     },
+    "node_modules/perfect-debounce": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "license": "ISC"
@@ -2194,30 +2243,31 @@
       }
     },
     "node_modules/pinia": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-4.0.2.tgz",
-      "integrity": "sha512-yKVVA7bSj5oRZFp/Ab9wLlmyb5gPUYEiIm4ryiWTe/xe7PtkRdMVOp1X1ggvq0c6Uj7Q0Du1HnV2mtAwM0Ks1g==",
+      "version": "3.0.4",
       "license": "MIT",
       "dependencies": {
-        "nostics": "^1.1.4"
+        "@vue/devtools-api": "^7.7.7"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
       },
       "peerDependencies": {
-        "@vue/devtools-api": "^8.1.5",
-        "typescript": ">=5.6.0",
+        "typescript": ">=4.5.0",
         "vue": "^3.5.11"
       },
       "peerDependenciesMeta": {
-        "@vue/devtools-api": {
-          "optional": false
-        },
         "typescript": {
           "optional": true
         }
       }
     },
+    "node_modules/pinia/node_modules/@vue/devtools-api": {
+      "version": "7.7.9",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^7.7.9"
+      }
+    },
     "node_modules/pkg-types": {
       "version": "2.3.1",
       "license": "MIT",
@@ -2299,6 +2349,10 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "license": "MIT"
+    },
     "node_modules/rolldown": {
       "version": "1.1.5",
       "devOptional": true,
@@ -2412,6 +2466,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/speakingurl": {
+      "version": "14.0.1",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/stackback": {
       "version": "0.0.2",
       "dev": true,
@@ -2510,6 +2571,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/superjson": {
+      "version": "2.2.6",
+      "license": "MIT",
+      "dependencies": {
+        "copy-anything": "^4"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "dev": true,
@@ -2639,67 +2710,23 @@
       }
     },
     "node_modules/unplugin": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.3.0.tgz",
-      "integrity": "sha512-qa66K+crbfyE6JK10GjvbJeRrOsuC/JpbnHctfyp/i4oBTxWOzJfRZyDiOk1PtErMFRu8JhsU/wPvOdBNWe5Rg==",
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/remapping": "^2.3.5",
-        "picomatch": "^4.0.4",
+        "picomatch": "^4.0.3",
         "webpack-virtual-modules": "^0.6.2"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
-      },
-      "peerDependencies": {
-        "@farmfe/core": "*",
-        "@rspack/core": "*",
-        "bun-types-no-globals": "*",
-        "esbuild": "*",
-        "rolldown": "*",
-        "rollup": "*",
-        "unloader": "*",
-        "vite": "*",
-        "webpack": "*"
-      },
-      "peerDependenciesMeta": {
-        "@farmfe/core": {
-          "optional": true
-        },
-        "@rspack/core": {
-          "optional": true
-        },
-        "bun-types-no-globals": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "rolldown": {
-          "optional": true
-        },
-        "rollup": {
-          "optional": true
-        },
-        "unloader": {
-          "optional": true
-        },
-        "vite": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
       }
     },
     "node_modules/unplugin-utils": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.3.2.tgz",
-      "integrity": "sha512-xVToRh2CTmLk2HnEG7ac4rl1MJTT3RFkpS8B++/SnB0kXvuaavD+n3m/vrzyWQOdJNSZQACnbz01pnppbwV5BA==",
+      "version": "0.3.1",
       "license": "MIT",
       "dependencies": {
         "pathe": "^2.0.3",
-        "picomatch": "^4.0.4"
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">=20.19.0"
@@ -2902,28 +2929,25 @@
       "license": "MIT"
     },
     "node_modules/vue-router": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.2.0.tgz",
-      "integrity": "sha512-QAC5i0LEb1GLG0LXDQmHu8L7FX12j0KwU/JTKmLQUJMrn04gQdKP6Du+p0QwpHb3iy71vBlqnHQ8WAfOSAWhqw==",
+      "version": "5.1.0",
       "license": "MIT",
       "dependencies": {
-        "@babel/generator": "^8.0.0",
-        "@vue-macros/common": "^3.1.3",
-        "@vue/devtools-api": "^8.1.5",
+        "@babel/generator": "^8.0.0-rc.4",
+        "@vue-macros/common": "^3.1.1",
+        "@vue/devtools-api": "^8.1.2",
         "ast-walker-scope": "^0.9.0",
         "chokidar": "^5.0.0",
         "json5": "^2.2.3",
-        "local-pkg": "^1.2.1",
+        "local-pkg": "^1.1.2",
         "magic-string": "^0.30.21",
         "mlly": "^1.8.2",
         "muggle-string": "^0.4.1",
-        "nostics": "^1.1.4",
         "pathe": "^2.0.3",
-        "picomatch": "^4.0.5",
+        "picomatch": "^4.0.3",
         "scule": "^1.3.0",
-        "tinyglobby": "^0.2.17",
-        "unplugin": "^3.3.0",
-        "unplugin-utils": "^0.3.2",
+        "tinyglobby": "^0.2.16",
+        "unplugin": "^3.0.0",
+        "unplugin-utils": "^0.3.1",
         "yaml": "^2.9.0"
       },
       "funding": {
@@ -2931,10 +2955,10 @@
       },
       "peerDependencies": {
         "@pinia/colada": ">=0.21.2",
-        "@vue/compiler-sfc": "^3.5.34 || ^4.0.0",
-        "pinia": "^3.0.4 || ^4.0.2",
-        "vite": "^7.3.0 || ^8.0.0",
-        "vue": "^3.5.34 || ^4.0.0"
+        "@vue/compiler-sfc": "^3.5.34",
+        "pinia": "^3.0.4",
+        "vite": "^7.0.0 || ^8.0.0",
+        "vue": "^3.5.34"
       },
       "peerDependenciesMeta": {
         "@pinia/colada": {
@@ -2952,14 +2976,12 @@
       }
     },
     "node_modules/vue-tsc": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.3.8.tgz",
-      "integrity": "sha512-xXmYlVQpcwJDWyGlqbHrGVOl1h3UOsASymRibrHc+iy9j/UNnOrOn4u+fntHz4D6Cs74RtapeqVV6CzJeg+UlA==",
+      "version": "3.3.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@volar/typescript": "2.4.28",
-        "@vue/language-core": "3.3.8"
+        "@vue/language-core": "3.3.7"
       },
       "bin": {
         "vue-tsc": "bin/vue-tsc.js"
@@ -2969,9 +2991,7 @@
       }
     },
     "node_modules/vuetify": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-4.1.6.tgz",
-      "integrity": "sha512-VOsRTsNfs+FE4JXMONZkqX2yznSqC/FXG9/pgVVjsoqIjUvJg+CfFTuOlgyWVFrZYY+crk7LV9uaiN8bZREV/g==",
+      "version": "4.1.2",
       "license": "MIT",
       "funding": {
         "type": "github",

package.json

@@ -18,7 +18,7 @@
     "test:coverage": "vitest run --coverage --config tests/js/vitest.config.ts"
   },
   "dependencies": {
-    "pinia": "^4.0.0",
+    "pinia": "^3.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="off"
+        autocomplete="username"
         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="new-password"
+        autocomplete="current-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: 'View the primary mailbox identity and sender aliases synced from the JMAP server.'
+    description: 'Configure the primary mailbox identity and any sender aliases exposed by this service.'
   },
   {
     title: 'Messages',
@@ -71,7 +71,7 @@ watch(
 )
 
 watch(
-  [deleteMode, deleteDestination],
+  [deleteMode, deleteDestination, primaryAddress, secondaryAddresses],
   () => {
     const nextService = props.service ?? new ServiceObject()
     const nextAuxiliary = {
@@ -83,9 +83,13 @@ watch(
     }
 
     if (sameAuxiliary(nextService.auxiliary ?? {}, nextAuxiliary)) {
-      return
+      if (sameAddresses(nextService)) {
+        return
+      }
     }
 
+    nextService.primaryAddress = primaryAddress.value.empty ? null : primaryAddress.value
+    nextService.secondaryAddresses = dedupeAddresses(secondaryAddresses.value)
     nextService.auxiliary = nextAuxiliary
     emit('update:service', nextService)
   },
@@ -107,10 +111,44 @@ 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>
@@ -138,57 +176,69 @@ function sameAuxiliary(current: Record<string, any>, next: Record<string, any>):
           <div class="jmap-settings-card">
             <h3 class="text-h6 mb-2">Addresses</h3>
             <p class="text-body-2 text-medium-emphasis mb-6">
-              The primary mailbox identity and sender aliases are managed by the JMAP server and synced automatically.
+              Configure the primary mailbox identity and any additional sender aliases exposed by this service.
             </p>
 
             <div class="text-subtitle-2 mb-2">Primary Address</div>
             <div class="d-flex ga-2 mb-6">
               <v-text-field
-                :model-value="primaryAddress.label"
+                v-model="primaryAddress.label"
                 label="Display Name"
                 variant="outlined"
                 density="compact"
                 hide-details="auto"
-                readonly
               />
               <v-text-field
-                :model-value="primaryAddress.address"
+                v-model="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
-                :model-value="entry.label"
+                v-model="entry.label"
                 label="Display Name"
                 variant="outlined"
                 density="compact"
                 hide-details="auto"
-                readonly
               />
               <v-text-field
-                :model-value="entry.address"
+                v-model="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>