fixup! feat: jmap support - initial

Signed-off-by: SebastianKrupinski <[email protected]>

Author: SebastianKrupinski

lib/Command/CreateImapAccount.php

@@ -5,7 +5,7 @@
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014-2016 owncloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 
 namespace OCA\Mail\Command;

lib/Db/MailAccount.php

@@ -303,6 +303,7 @@ public function __construct(array $params = []) {
 		$this->addType('classificationEnabled', 'boolean');
 		$this->addType('imipCreate', 'boolean');
 		$this->addType('protocol', 'string');
+		$this->addType('path', 'string');
 	}
 
 	public function getOutOfOfficeFollowsSystem(): bool {
@@ -354,7 +355,7 @@ public function toJson() {
 			'debug' => $this->getDebug(),
 			'classificationEnabled' => $this->getClassificationEnabled(),
 			'imipCreate' => $this->getImipCreate(),
-			'protocol' => $this->getProtocol() ?? self::PROTOCOL_IMAP,
+			'protocol' => $this->getProtocol(),
 			'path' => $this->getPath(),
 		];
 

lib/Db/Mailbox.php

@@ -56,10 +56,10 @@
  * @method void setShared(bool $shared)
  * @method string getNameHash()
  * @method void setNameHash(string $nameHash)
- * @method string|null getRpid()
- * @method void setRpid(?string $rpid)
- * @method string|null getRid()
- * @method void setRid(?string $rid)
+ * @method string|null getRemoteParentId()
+ * @method void setRemoteParentId(?string $remoteParentId)
+ * @method string|null getRemoteId()
+ * @method void setRemoteId(?string $remoteId)
  * @method string|null getState()
  * @method void setState(?string $state)
  */
@@ -82,8 +82,8 @@ class Mailbox extends Entity implements JsonSerializable {
 	protected $myAcls;
 	protected $shared;
 	protected $nameHash;
-	protected ?string $rpid = null;
-	protected ?string $rid = null;
+	protected ?string $remoteParentId = null;
+	protected ?string $remoteId = null;
 	protected ?string $state = null;
 
 	/**

lib/Db/Message.php

@@ -73,8 +73,8 @@
  * @method void setEncrypted(bool|null $encrypted)
  * @method bool getMentionsMe()
  * @method void setMentionsMe(bool $isMentionned)
- * @method string|null getRid()
- * @method void setRid(?string $rid)
+ * @method string|null getRemoteId()
+ * @method void setRemoteId(?string $remoteId)
  */
 class Message extends Entity implements JsonSerializable {
 	private const MUTABLE_FLAGS = [
@@ -119,7 +119,7 @@ class Message extends Entity implements JsonSerializable {
 	protected $imipProcessed = false;
 	protected $imipError = false;
 	protected $mentionsMe = false;
-	protected ?string $rid = null;
+	protected ?string $remoteId = null;
 
 	/**
 	 * @var bool|null
@@ -345,6 +345,7 @@ public function jsonSerialize() {
 		return [
 			'databaseId' => $this->getId(),
 			'uid' => $this->getUid(),
+			'remoteId' => $this->getRemoteId(),
 			'subject' => $this->getSubject(),
 			'dateInt' => $this->getSentAt(),
 			'flags' => [

lib/Migration/Version5800Date20260401000001.php

@@ -21,6 +21,7 @@
  * @psalm-api
  */
 #[AddColumn(table: 'mail_accounts', name: 'protocol', type: ColumnType::STRING)]
+#[AddColumn(table: 'mail_accounts', name: 'path', type: ColumnType::STRING)]
 class Version5800Date20260401000001 extends SimpleMigrationStep {
 
 	/**

lib/Migration/Version5800Date20260401000002.php

@@ -20,8 +20,8 @@
 /**
  * @psalm-api
  */
-#[AddColumn(table: 'mail_mailboxes', name: 'rpid', type: ColumnType::STRING)]
-#[AddColumn(table: 'mail_mailboxes', name: 'rid', type: ColumnType::STRING)]
+#[AddColumn(table: 'mail_mailboxes', name: 'remote_parent_id', type: ColumnType::STRING)]
+#[AddColumn(table: 'mail_mailboxes', name: 'remote_id', type: ColumnType::STRING)]
 #[AddColumn(table: 'mail_mailboxes', name: 'state', type: ColumnType::STRING)]
 class Version5800Date20260401000002 extends SimpleMigrationStep {
 
@@ -35,15 +35,15 @@ class Version5800Date20260401000002 extends SimpleMigrationStep {
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
 		$schema = $schemaClosure();
 		$mailboxesTable = $schema->getTable('mail_mailboxes');
-		if (!$mailboxesTable->hasColumn('rpid')) {
-			$mailboxesTable->addColumn('rpid', Types::STRING, [
+		if (!$mailboxesTable->hasColumn('remote_parent_id')) {
+			$mailboxesTable->addColumn('remote_parent_id', Types::STRING, [
 				'length' => 255,
 				'notnull' => false,
 				'default' => null,
 			]);
 		}
-		if (!$mailboxesTable->hasColumn('rid')) {
-			$mailboxesTable->addColumn('rid', Types::STRING, [
+		if (!$mailboxesTable->hasColumn('remote_id')) {
+			$mailboxesTable->addColumn('remote_id', Types::STRING, [
 				'length' => 255,
 				'notnull' => false,
 				'default' => null,

lib/Migration/Version5800Date20260401000003.php

@@ -20,7 +20,7 @@
 /**
  * @psalm-api
  */
-#[AddColumn(table: 'mail_messages', name: 'rid', type: ColumnType::STRING)]
+#[AddColumn(table: 'mail_messages', name: 'remote_id', type: ColumnType::STRING)]
 class Version5800Date20260401000003 extends SimpleMigrationStep {
 
 	/**
@@ -34,8 +34,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$schema = $schemaClosure();
 		$messagesTable = $schema->getTable('mail_messages');
 
-		if (!$messagesTable->hasColumn('rid')) {
-			$messagesTable->addColumn('rid', Types::STRING, [
+		if (!$messagesTable->hasColumn('remote_id')) {
+			$messagesTable->addColumn('remote_id', Types::STRING, [
 				'length' => 255,
 				'notnull' => false,
 				'default' => null,