fixup! feat: add delegation backend

Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>

Author: hamza221

lib/Controller/AccountApiController.php

@@ -14,6 +14,7 @@
 use OCA\Mail\ResponseDefinitions;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AliasesService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -32,6 +33,7 @@ public function __construct(
 		private readonly ?string $userId,
 		private readonly AccountService $accountService,
 		private readonly AliasesService $aliasesService,
+		private readonly DelegationService $delegationService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -54,17 +56,37 @@ public function list(): DataResponse {
 		}
 
 		$accounts = $this->accountService->findByUserId($userId);
-		return new DataResponse(array_map(function (Account $account) use ($userId) {
+		$result = array_map(function (Account $account) use ($userId) {
 			$aliases = $this->aliasesService->findAll($account->getId(), $userId);
 			return [
 				'id' => $account->getId(),
 				'email' => $account->getEmail(),
+				'isDelegated' => false,
 				'aliases' => array_map(static fn (Alias $alias) => [
 					'id' => $alias->getId(),
 					'email' => $alias->getAlias(),
 					'name' => $alias->getName(),
 				], $aliases),
 			];
-		}, $accounts));
+		}, $accounts);
+
+		$delegatedAccounts = $this->accountService->findDelegatedAccounts($userId);
+		foreach ($delegatedAccounts as $mailAccount) {
+			$account = new Account($mailAccount);
+			$ownerUserId = $mailAccount->getUserId();
+			$aliases = $this->aliasesService->findAll($account->getId(), $ownerUserId);
+			$result[] = [
+				'id' => $account->getId(),
+				'email' => $account->getEmail(),
+				'isDelegated' => true,
+				'aliases' => array_map(static fn (Alias $alias) => [
+					'id' => $alias->getId(),
+					'email' => $alias->getAlias(),
+					'name' => $alias->getName(),
+				], $aliases),
+			];
+		}
+
+		return new DataResponse($result);
 	}
 }

lib/Controller/AliasesController.php

@@ -12,6 +12,7 @@
 use OCA\Mail\Exception\NotImplemented;
 use OCA\Mail\Http\TrapError;
 use OCA\Mail\Service\AliasesService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
@@ -23,14 +24,17 @@
 class AliasesController extends Controller {
 	private AliasesService $aliasService;
 	private string $currentUserId;
+	private DelegationService $delegationService;
 
 	public function __construct(string $appName,
 		IRequest $request,
 		AliasesService $aliasesService,
-		string $UserId) {
+		string $UserId,
+		DelegationService $delegationService) {
 		parent::__construct($appName, $request);
 		$this->aliasService = $aliasesService;
 		$this->currentUserId = $UserId;
+		$this->delegationService = $delegationService;
 	}
 
 	/**
@@ -42,7 +46,8 @@ public function __construct(string $appName,
 	 */
 	#[TrapError]
 	public function index(int $accountId): JSONResponse {
-		return new JSONResponse($this->aliasService->findAll($accountId, $this->currentUserId));
+		$effectiveUserId = $this->delegationService->resolveAccountUserId($accountId, $this->currentUserId);
+		return new JSONResponse($this->aliasService->findAll($accountId, $effectiveUserId));
 	}
 
 	/**
@@ -64,9 +69,10 @@ public function update(int $id,
 		string $alias,
 		string $aliasName,
 		?int $smimeCertificateId = null): JSONResponse {
+		$effectiveUserId = $this->delegationService->resolveAliasUserId($id, $this->currentUserId);
 		return new JSONResponse(
 			$this->aliasService->update(
-				$this->currentUserId,
+				$effectiveUserId,
 				$id,
 				$alias,
 				$aliasName,
@@ -83,7 +89,8 @@ public function update(int $id,
 	 */
 	#[TrapError]
 	public function destroy(int $id): JSONResponse {
-		return new JSONResponse($this->aliasService->delete($this->currentUserId, $id));
+		$effectiveUserId = $this->delegationService->resolveAliasUserId($id, $this->currentUserId);
+		return new JSONResponse($this->aliasService->delete($effectiveUserId, $id));
 	}
 
 	/**
@@ -98,8 +105,9 @@ public function destroy(int $id): JSONResponse {
 	 */
 	#[TrapError]
 	public function create(int $accountId, string $alias, string $aliasName): JSONResponse {
+		$effectiveUserId = $this->delegationService->resolveAccountUserId($accountId, $this->currentUserId);
 		return new JSONResponse(
-			$this->aliasService->create($this->currentUserId, $accountId, $alias, $aliasName),
+			$this->aliasService->create($effectiveUserId, $accountId, $alias, $aliasName),
 			Http::STATUS_CREATED
 		);
 	}
@@ -115,6 +123,7 @@ public function create(int $accountId, string $alias, string $aliasName): JSONRe
 	 */
 	#[TrapError]
 	public function updateSignature(int $id, ?string $signature = null): JSONResponse {
-		return new JSONResponse($this->aliasService->updateSignature($this->currentUserId, $id, $signature));
+		$effectiveUserId = $this->delegationService->resolveAliasUserId($id, $this->currentUserId);
+		return new JSONResponse($this->aliasService->updateSignature($effectiveUserId, $id, $signature));
 	}
 }

lib/Controller/DelegationController.php

@@ -30,7 +30,7 @@ public function __construct(
 		private DelegationService $delegationService,
 		private AccountService $accountService,
 		private IUserManager $userManager,
-		?string $UserId
+		?string $UserId,
 	) {
 		parent::__construct($appName, $request);
 		$this->currentUserId = $UserId;

lib/Controller/FilterController.php

@@ -11,9 +11,9 @@
 
 use OCA\Mail\AppInfo\Application;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DelegationService;
 use OCA\Mail\Service\FilterService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\Route;
 use OCP\AppFramework\Http\JSONResponse;
@@ -27,6 +27,7 @@ public function __construct(
 		string $userId,
 		private FilterService $mailFilterService,
 		private AccountService $accountService,
+		private DelegationService $delegationService,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 		$this->currentUserId = $userId;
@@ -39,11 +40,8 @@ public function __construct(
 	#[Route(Route::TYPE_FRONTPAGE, verb: 'GET', url: '/api/filter/{accountId}', requirements: ['accountId' => '[\d]+'])]
 	#[NoAdminRequired]
 	public function getFilters(int $accountId): JSONResponse {
-		$account = $this->accountService->findById($accountId);
-
-		if ($account->getUserId() !== $this->currentUserId) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+		$effectiveUserId = $this->delegationService->resolveAccountUserId($accountId, $this->currentUserId);
+		$account = $this->accountService->find($effectiveUserId, $accountId);
 
 		$result = $this->mailFilterService->parse($account->getMailAccount());
 
@@ -56,11 +54,8 @@ public function getFilters(int $accountId): JSONResponse {
 	#[Route(Route::TYPE_FRONTPAGE, verb: 'PUT', url: '/api/filter/{accountId}', requirements: ['accountId' => '[\d]+'])]
 	#[NoAdminRequired]
 	public function updateFilters(int $accountId, array $filters): JSONResponse {
-		$account = $this->accountService->findById($accountId);
-
-		if ($account->getUserId() !== $this->currentUserId) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+		$effectiveUserId = $this->delegationService->resolveAccountUserId($accountId, $this->currentUserId);
+		$account = $this->accountService->find($effectiveUserId, $accountId);
 
 		$this->mailFilterService->update($account->getMailAccount(), $filters);
 

lib/Controller/ListController.php

@@ -15,6 +15,7 @@
 use OCA\Mail\Http\JsonResponse;
 use OCA\Mail\IMAP\IMAPClientFactory;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
@@ -31,14 +32,16 @@ class ListController extends Controller {
 	private IClientService $httpClientService;
 	private LoggerInterface $logger;
 	private ?string $currentUserId;
+	private DelegationService $delegationService;
 
 	public function __construct(IRequest $request,
 		IMailManager $mailManager,
 		AccountService $accountService,
 		IMAPClientFactory $clientFactory,
 		IClientService $httpClientService,
 		LoggerInterface $logger,
-		?string $userId) {
+		?string $userId,
+		DelegationService $delegationService) {
 		parent::__construct(Application::APP_ID, $request);
 		$this->mailManager = $mailManager;
 		$this->accountService = $accountService;
@@ -47,6 +50,7 @@ public function __construct(IRequest $request,
 		$this->httpClientService = $httpClientService;
 		$this->logger = $logger;
 		$this->currentUserId = $userId;
+		$this->delegationService = $delegationService;
 	}
 
 	/**
@@ -59,9 +63,10 @@ public function unsubscribe(int $id): JsonResponse {
 		}
 
 		try {
-			$message = $this->mailManager->getMessage($this->currentUserId, $id);
-			$mailbox = $this->mailManager->getMailbox($this->currentUserId, $message->getMailboxId());
-			$account = $this->accountService->find($this->currentUserId, $mailbox->getAccountId());
+			$effectiveUserId = $this->delegationService->resolveMessageUserId($id, $this->currentUserId);
+			$message = $this->mailManager->getMessage($effectiveUserId, $id);
+			$mailbox = $this->mailManager->getMailbox($effectiveUserId, $message->getMailboxId());
+			$account = $this->accountService->find($effectiveUserId, $mailbox->getAccountId());
 		} catch (DoesNotExistException $e) {
 			return JsonResponse::fail(null, Http::STATUS_NOT_FOUND);
 		}

lib/Controller/MailboxesApiController.php

@@ -13,6 +13,7 @@
 use OCA\Mail\Contracts\IMailSearch;
 use OCA\Mail\ResponseDefinitions;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
@@ -33,6 +34,7 @@ public function __construct(
 		private IMailManager $mailManager,
 		private readonly AccountService $accountService,
 		private IMailSearch $mailSearch,
+		private DelegationService $delegationService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -56,7 +58,8 @@ public function list(int $accountId): DataResponse {
 		}
 
 		try {
-			$account = $this->accountService->find($userId, $accountId);
+			$effectiveUserId = $this->delegationService->resolveAccountUserId($accountId, $userId);
+			$account = $this->accountService->find($effectiveUserId, $accountId);
 		} catch (DoesNotExistException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
@@ -97,8 +100,9 @@ public function listMessages(int $mailboxId,
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 		try {
-			$mailbox = $this->mailManager->getMailbox($userId, $mailboxId);
-			$account = $this->accountService->find($userId, $mailbox->getAccountId());
+			$effectiveUserId = $this->delegationService->resolveMailboxUserId($mailboxId, $userId);
+			$mailbox = $this->mailManager->getMailbox($effectiveUserId, $mailboxId);
+			$account = $this->accountService->find($effectiveUserId, $mailbox->getAccountId());
 		} catch (DoesNotExistException $e) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}

lib/Controller/MessageApiController.php

@@ -21,6 +21,7 @@
 use OCA\Mail\Service\AliasesService;
 use OCA\Mail\Service\Attachment\AttachmentService;
 use OCA\Mail\Service\Attachment\UploadedFile;
+use OCA\Mail\Service\DelegationService;
 use OCA\Mail\Service\ItineraryService;
 use OCA\Mail\Service\MailManager;
 use OCA\Mail\Service\OutboxService;
@@ -66,6 +67,7 @@ public function __construct(
 		private IDkimService $dkimService,
 		private ItineraryService $itineraryService,
 		private TrustedSenderService $trustedSenderService,
+		private DelegationService $delegationService,
 	) {
 		parent::__construct($appName, $request);
 		$this->userId = $userId;
@@ -120,15 +122,16 @@ public function send(
 		}
 
 		try {
-			$mailAccount = $this->accountService->find($this->userId, $accountId);
+			$effectiveUserId = $this->delegationService->resolveAccountUserId($accountId, $this->userId);
+			$mailAccount = $this->accountService->find($effectiveUserId, $accountId);
 		} catch (ClientException $e) {
 			$this->logger->error("Mail account #$accountId not found", ['exception' => $e]);
 			return new DataResponse('Account not found.', Http::STATUS_NOT_FOUND);
 		}
 
 		if ($fromEmail !== $mailAccount->getEmail()) {
 			try {
-				$alias = $this->aliasesService->findByAliasAndUserId($fromEmail, $this->userId);
+				$alias = $this->aliasesService->findByAliasAndUserId($fromEmail, $effectiveUserId);
 			} catch (DoesNotExistException $e) {
 				$this->logger->error("Alias $fromEmail for mail account $accountId not found", ['exception' => $e]);
 				// Cannot send from this email as it is not configured as an alias
@@ -234,9 +237,10 @@ public function get(int $id): DataResponse {
 		}
 
 		try {
-			$message = $this->mailManager->getMessage($this->userId, $id);
-			$mailbox = $this->mailManager->getMailbox($this->userId, $message->getMailboxId());
-			$account = $this->accountService->find($this->userId, $mailbox->getAccountId());
+			$effectiveUserId = $this->delegationService->resolveMessageUserId($id, $this->userId);
+			$message = $this->mailManager->getMessage($effectiveUserId, $id);
+			$mailbox = $this->mailManager->getMailbox($effectiveUserId, $message->getMailboxId());
+			$account = $this->accountService->find($effectiveUserId, $mailbox->getAccountId());
 		} catch (ClientException|DoesNotExistException $e) {
 			$this->logger->error('Message, Account or Mailbox not found', ['exception' => $e->getMessage()]);
 			return new DataResponse('Account not found.', Http::STATUS_NOT_FOUND);
@@ -322,9 +326,10 @@ public function getRaw(int $id): DataResponse {
 		}
 
 		try {
-			$message = $this->mailManager->getMessage($this->userId, $id);
-			$mailbox = $this->mailManager->getMailbox($this->userId, $message->getMailboxId());
-			$account = $this->accountService->find($this->userId, $mailbox->getAccountId());
+			$effectiveUserId = $this->delegationService->resolveMessageUserId($id, $this->userId);
+			$message = $this->mailManager->getMessage($effectiveUserId, $id);
+			$mailbox = $this->mailManager->getMailbox($effectiveUserId, $message->getMailboxId());
+			$account = $this->accountService->find($effectiveUserId, $mailbox->getAccountId());
 		} catch (ClientException|DoesNotExistException $e) {
 			$this->logger->error('Message, Account or Mailbox not found', ['exception' => $e->getMessage()]);
 			return new DataResponse('Message, Account or Mailbox not found', Http::STATUS_NOT_FOUND);
@@ -383,9 +388,10 @@ private function enrichDownloadUrl(int $id, array $attachment): array {
 	#[TrapError]
 	public function getAttachment(int $id, string $attachmentId): DataResponse {
 		try {
-			$message = $this->mailManager->getMessage($this->userId, $id);
-			$mailbox = $this->mailManager->getMailbox($this->userId, $message->getMailboxId());
-			$account = $this->accountService->find($this->userId, $mailbox->getAccountId());
+			$effectiveUserId = $this->delegationService->resolveMessageUserId($id, $this->userId);
+			$message = $this->mailManager->getMessage($effectiveUserId, $id);
+			$mailbox = $this->mailManager->getMailbox($effectiveUserId, $message->getMailboxId());
+			$account = $this->accountService->find($effectiveUserId, $mailbox->getAccountId());
 		} catch (DoesNotExistException|ClientException $e) {
 			return new DataResponse('Message, Account or Mailbox not found', Http::STATUS_NOT_FOUND);
 		}