[stable3.3] fix: Fix sending local draft

appinfo/routes.php

@@ -365,6 +365,11 @@
 			'url' => '/api/outbox/{id}',
 			'verb' => 'POST'
 		],
+		[
+			'name' => 'outbox#createFromDraft',
+			'url' => '/api/outbox/from-draft/{id}',
+			'verb' => 'POST'
+		],
 		[
 			'name' => 'googleIntegration#configure',
 			'url' => '/api/integration/google',

lib/Controller/OutboxController.php

@@ -32,6 +32,7 @@
 use OCA\Mail\Http\JsonResponse;
 use OCA\Mail\Http\TrapError;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DraftsService;
 use OCA\Mail\Service\OutboxService;
 use OCA\Mail\Service\SmimeService;
 use OCP\AppFramework\Controller;
@@ -149,6 +150,25 @@ public function create(
 		return JsonResponse::success($message, Http::STATUS_CREATED);
 	}
 
+	/**
+	 * @NoAdminRequired
+	 *
+	 * @return JsonResponse
+	 */
+	#[TrapError]
+	public function createFromDraft(DraftsService $draftsService, int $id, int $sendAt = null): JsonResponse {
+		$draftMessage = $draftsService->getMessage($id, $this->userId);
+		// Locate the account to check authorization
+		$this->accountService->find($this->userId, $draftMessage->getAccountId());
+
+		$outboxMessage = $this->service->convertDraft($draftMessage, $sendAt);
+
+		return  JsonResponse::success(
+			$outboxMessage,
+			Http::STATUS_CREATED,
+		);
+	}
+
 	/**
 	 * @NoAdminRequired
 	 *

lib/Db/LocalMessageMapper.php

@@ -100,16 +100,18 @@ public function getAllForUser(string $userId, int $type = LocalMessage::TYPE_OUT
 	}
 
 	/**
+	 * @param LocalMessage::TYPE_* $type
 	 * @throws DoesNotExistException
 	 */
-	public function findById(int $id, string $userId): LocalMessage {
+	public function findById(int $id, string $userId, int $type): LocalMessage {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('m.*')
 			->from('mail_accounts', 'a')
 			->join('a', $this->getTableName(), 'm', $qb->expr()->eq('m.account_id', 'a.id'))
 			->where(
 				$qb->expr()->eq('a.user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR),
-				$qb->expr()->eq('m.id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT)
+				$qb->expr()->eq('m.id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
+				$qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
 			);
 		$entity = $this->findEntity($qb);
 		$entity->setAttachments($this->attachmentMapper->findByLocalMessageId($userId, $id));

lib/Service/DraftsService.php

@@ -208,7 +208,7 @@ public function sendMessage(LocalMessage $message, Account $account): void {
 	 * @throws DoesNotExistException
 	 */
 	public function getMessage(int $id, string $userId): LocalMessage {
-		return $this->mapper->findById($id, $userId);
+		return $this->mapper->findById($id, $userId, LocalMessage::TYPE_DRAFT);
 	}
 
 	/**

lib/Service/OutboxService.php

@@ -117,7 +117,7 @@ public function getMessages(string $userId): array {
 	 * @throws DoesNotExistException
 	 */
 	public function getMessage(int $id, string $userId): LocalMessage {
-		return $this->mapper->findById($id, $userId);
+		return $this->mapper->findById($id, $userId, LocalMessage::TYPE_OUTGOING);
 	}
 
 	/**
@@ -274,4 +274,11 @@ public function flush(): void {
 			}
 		}
 	}
+
+	public function convertDraft(LocalMessage $draftMessage, int $sendAt): LocalMessage {
+		$outboxMessage = clone $draftMessage;
+		$outboxMessage->setType(LocalMessage::TYPE_OUTGOING);
+		$outboxMessage->setSendAt($sendAt);
+		return $this->mapper->update($outboxMessage);
+	}
 }

src/components/NewMessageModal.vue

@@ -212,7 +212,7 @@ export default {
 					let idToReturn
 					const dataForServer = this.getDataForServer(data, true)
 					if (!id) {
-						const { id } = await saveDraft(data.account, dataForServer)
+						const { id } = await saveDraft(dataForServer)
 						dataForServer.id = id
 						await this.$store.dispatch('patchComposerData', { id, draftId: dataForServer.draftId })
 						this.canSaveDraft = true
@@ -307,17 +307,26 @@ export default {
 				}
 
 				if (!this.composerData.id) {
-					const { id } = await saveDraft(data.account, dataForServer)
+					// This is a new message
+					const { id } = await saveDraft(dataForServer)
 					dataForServer.id = id
 					await this.$store.dispatch('outbox/enqueueMessage', {
 						message: dataForServer,
 					})
-				} else {
+				} else if (this.composerData.type === 0) {
+					// This is an outbox message
 					dataForServer.id = this.composerData.id
 					await this.$store.dispatch('outbox/updateMessage', {
 						message: dataForServer,
 						id: this.composerData.id,
 					})
+				} else {
+					// This is a draft
+					dataForServer.id = this.composerData.id
+					await this.$store.dispatch('outbox/enqueueFromDraft', {
+						draftMessage: dataForServer,
+						id: this.composerData.id,
+					})
 				}
 
 				if (!data.sendAt || data.sendAt < Math.floor((now + UNDO_DELAY) / 1000)) {

src/service/DraftService.js

@@ -25,10 +25,8 @@ import { generateUrl } from '@nextcloud/router'
 
 import { convertAxiosError } from '../errors/convert'
 
-export async function saveDraft(accountId, data) {
-	const url = generateUrl('/apps/mail/api/drafts', {
-		accountId,
-	})
+export async function saveDraft(data) {
+	const url = generateUrl('/apps/mail/api/drafts')
 
 	try {
 		return (await axios.post(url, data)).data.data

src/service/OutboxService.js

@@ -45,6 +45,16 @@ export async function enqueueMessage(message) {
 	const { data } = await axios.post(url, message)
 	return data.data
 }
+
+export async function enqueueMessageFromDraft(id, message) {
+	const url = generateUrl('/apps/mail/api/outbox/from-draft/{id}', {
+		id,
+	})
+
+	const { data } = await axios.post(url, message)
+	return data.data
+}
+
 export async function updateMessage(message, id) {
 	const url = generateUrl('/apps/mail/api/outbox/{id}', {
 		id,

src/store/outbox/actions.js

@@ -73,6 +73,19 @@ export default {
 		return message
 	},
 
+	async enqueueFromDraft({ commit }, { id, draftMessage }) {
+		const message = await OutboxService.enqueueMessageFromDraft(id, draftMessage)
+
+		commit('addMessage', { message })
+
+		// Future drafts/sends after an error should go through outbox logic
+		commit('convertComposerMessageToOutbox', { message }, {
+			root: true,
+		})
+
+		return message
+	},
+
 	async stopMessage({ commit }, { message }) {
 		commit('stopMessage', { message })
 		const updatedMessage = await OutboxService.updateMessage({

tests/Integration/Db/LocalMessageMapperTest.php

@@ -107,7 +107,7 @@ public function testFindAllForUser(): void {
 	 * @depends testFindAllForUser
 	 */
 	public function testFindById(): void {
-		$row = $this->mapper->findById($this->entity->getId(), $this->account->getUserId());
+		$row = $this->mapper->findById($this->entity->getId(), $this->account->getUserId(), LocalMessage::TYPE_OUTGOING);
 
 		$this->assertEquals(LocalMessage::TYPE_OUTGOING, $row->getType());
 		$this->assertEquals(2, $row->getAliasId());
@@ -122,7 +122,7 @@ public function testFindById(): void {
 
 	public function testFindByIdNotFound(): void {
 		$this->expectException(DoesNotExistException::class);
-		$this->mapper->findById(1337, $this->account->getUserId());
+		$this->mapper->findById(1337, $this->account->getUserId(), LocalMessage::TYPE_DRAFT);
 	}
 
 	/**

tests/Integration/Db/RecipientMapperTest.php

@@ -190,7 +190,7 @@ public function testUpdateRecipients(): void {
 		$results = $this->mapper->findByLocalMessageId($message->getId());
 		$this->assertCount(1, $results);
 
-		$message = $this->localMessageMapper->findById($message->getId(), $this->getTestAccountUserId());
+		$message = $this->localMessageMapper->findById($message->getId(), $this->getTestAccountUserId(), LocalMessage::TYPE_OUTGOING);
 
 		$pierre = new Recipient();
 		$pierre->setLabel('Pierre');