fixup! feat: add delegation backend

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

Author: hamza221

tests/Unit/Controller/AccountApiControllerTest.php

@@ -16,6 +16,7 @@
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AliasesService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Http;
 use OCP\IRequest;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -28,20 +29,23 @@ class AccountApiControllerTest extends TestCase {
 	private IRequest&MockObject $request;
 	private AccountService&MockObject $accountService;
 	private AliasesService&MockObject $aliasesService;
+	private DelegationService&MockObject $delegationService;
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
 		$this->accountService = $this->createMock(AccountService::class);
 		$this->aliasesService = $this->createMock(AliasesService::class);
+		$this->delegationService = $this->createMock(DelegationService::class);
 
 		$this->controller = new AccountApiController(
 			'mail',
 			$this->request,
 			self::USER_ID,
 			$this->accountService,
 			$this->aliasesService,
+			$this->delegationService,
 		);
 	}
 
@@ -52,6 +56,7 @@ public function testListWithoutUser() {
 			null,
 			$this->accountService,
 			$this->aliasesService,
+			$this->delegationService,
 		);
 
 		$this->accountService->expects(self::never())
@@ -74,6 +79,10 @@ public function testList() {
 			->method('findByUserId')
 			->with(self::USER_ID)
 			->willReturn([$account]);
+		$this->accountService->expects(self::once())
+			->method('findDelegatedAccounts')
+			->with(self::USER_ID)
+			->willReturn([]);
 
 		$alias = new Alias();
 		$alias->setId(10);
@@ -90,6 +99,7 @@ public function testList() {
 			[
 				'id' => 42,
 				'email' => 'foo@bar.com',
+				'isDelegated' => false,
 				'aliases' => [
 					[
 						'id' => 10,
@@ -111,6 +121,10 @@ public function testListWithAliasWithoutName() {
 			->method('findByUserId')
 			->with(self::USER_ID)
 			->willReturn([$account]);
+		$this->accountService->expects(self::once())
+			->method('findDelegatedAccounts')
+			->with(self::USER_ID)
+			->willReturn([]);
 
 		$alias = new Alias();
 		$alias->setId(10);
@@ -127,6 +141,7 @@ public function testListWithAliasWithoutName() {
 			[
 				'id' => 42,
 				'email' => 'foo@bar.com',
+				'isDelegated' => false,
 				'aliases' => [
 					[
 						'id' => 10,
@@ -148,6 +163,10 @@ public function testListWithoutAliases() {
 			->method('findByUserId')
 			->with(self::USER_ID)
 			->willReturn([$account]);
+		$this->accountService->expects(self::once())
+			->method('findDelegatedAccounts')
+			->with(self::USER_ID)
+			->willReturn([]);
 
 		$this->aliasesService->expects(self::once())
 			->method('findAll')
@@ -160,6 +179,7 @@ public function testListWithoutAliases() {
 			[
 				'id' => 42,
 				'email' => 'foo@bar.com',
+				'isDelegated' => false,
 				'aliases' => [],
 			]
 		], $actual->getData());

tests/Unit/Controller/AccountsControllerTest.php

@@ -143,6 +143,10 @@ public function testIndex(): void {
 			->method('findAll')
 			->with(self::equalTo($this->accountId), self::equalTo($this->userId))
 			->will(self::returnValue(['a1', 'a2']));
+		$this->accountService->expects(self::once())
+			->method('findDelegatedAccounts')
+			->with(self::equalTo($this->userId))
+			->willReturn([]);
 
 		$response = $this->controller->index();
 
@@ -153,6 +157,7 @@ public function testIndex(): void {
 					'a1',
 					'a2',
 				],
+				'isDelegated' => false,
 			]
 		]);
 		self::assertEquals($expectedResponse, $response);

tests/Unit/Controller/AliasesControllerTest.php

@@ -15,6 +15,7 @@
 use OCA\Mail\Exception\ClientException;
 use OCA\Mail\Exception\NotImplemented;
 use OCA\Mail\Service\AliasesService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
@@ -35,6 +36,9 @@ class AliasesControllerTest extends TestCase {
 	/** @var AliasesService */
 	private $aliasService;
 
+	/** @var DelegationService */
+	private $delegationService;
+
 	public function setUp(): void {
 		parent::setUp();
 		$this->request = $this->getMockBuilder('OCP\IRequest')
@@ -48,7 +52,12 @@ public function setUp(): void {
 		$this->mailAccountMapper = $this->createMock(MailAccountMapper::class);
 
 		$this->aliasService = new AliasesService($this->aliasMapper, $this->mailAccountMapper);
-		$this->controller = new AliasesController($this->appName, $this->request, $this->aliasService, $this->userId);
+		$this->delegationService = $this->createMock(DelegationService::class);
+		$this->delegationService->method('resolveAccountUserId')
+			->willReturn($this->userId);
+		$this->delegationService->method('resolveAliasUserId')
+			->willReturn($this->userId);
+		$this->controller = new AliasesController($this->appName, $this->request, $this->aliasService, $this->userId, $this->delegationService);
 	}
 
 	public function testIndex(): void {

tests/Unit/Controller/DraftsControllerTest.php

@@ -19,6 +19,7 @@
 use OCA\Mail\Exception\ServiceException;
 use OCA\Mail\Http\JsonResponse;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DelegationService;
 use OCA\Mail\Service\DraftsService;
 use OCA\Mail\Service\SmimeService;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -35,6 +36,7 @@ class DraftsControllerTest extends TestCase {
 	private AccountService $accountService;
 	private DraftsController $controller;
 	private SmimeService $smimeService;
+	private DelegationService $delegationService;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -46,6 +48,11 @@ protected function setUp(): void {
 		$this->accountService = $this->createMock(AccountService::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->smimeService = $this->createMock(SmimeService::class);
+		$this->delegationService = $this->createMock(DelegationService::class);
+		$this->delegationService->method('resolveAccountUserId')
+			->willReturn($this->userId);
+		$this->delegationService->method('resolveLocalMessageUserId')
+			->willReturn($this->userId);
 
 		$this->controller = new DraftsController(
 			$this->appName,
@@ -54,7 +61,8 @@ protected function setUp(): void {
 			$this->service,
 			$this->accountService,
 			$this->timeFactory,
-			$this->smimeService
+			$this->smimeService,
+			$this->delegationService,
 		);
 	}
 

tests/Unit/Controller/ListControllerTest.php

@@ -34,6 +34,9 @@ protected function setUp(): void {
 		$this->serviceMock = $this->createServiceMock(ListController::class, [
 			'userId' => 'user123',
 		]);
+		$this->serviceMock->getParameter('delegationService')
+			->method('resolveMessageUserId')
+			->willReturn('user123');
 		$this->controller = $this->serviceMock->getService();
 	}
 

tests/Unit/Controller/MailboxesApiControllerTest.php

@@ -19,6 +19,7 @@
 use OCA\Mail\Db\Message as DbMessage;
 use OCA\Mail\Folder;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DelegationService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\IRequest;
@@ -33,6 +34,7 @@ class MailboxesApiControllerTest extends TestCase {
 	private IMailManager|MockObject $mailManager;
 	private AccountService&MockObject $accountService;
 	private MockObject|IMailSearch $mailSearch;
+	private DelegationService&MockObject $delegationService;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -41,6 +43,11 @@ protected function setUp(): void {
 		$this->accountService = $this->createMock(AccountService::class);
 		$this->mailManager = $this->createMock(IMailManager::class);
 		$this->mailSearch = $this->createMock(IMailSearch::class);
+		$this->delegationService = $this->createMock(DelegationService::class);
+		$this->delegationService->method('resolveAccountUserId')
+			->willReturn(self::USER_ID);
+		$this->delegationService->method('resolveMailboxUserId')
+			->willReturn(self::USER_ID);
 
 		$this->controller = new MailboxesApiController(
 			'mail',
@@ -49,7 +56,7 @@ protected function setUp(): void {
 			$this->mailManager,
 			$this->accountService,
 			$this->mailSearch,
-
+			$this->delegationService,
 		);
 	}
 
@@ -61,6 +68,7 @@ public function testListMailboxesWithoutUser() {
 			$this->mailManager,
 			$this->accountService,
 			$this->mailSearch,
+			$this->delegationService,
 		);
 
 		$this->accountService->expects(self::never())
@@ -101,6 +109,7 @@ public function testListMessagesWithoutUser() {
 			$this->mailManager,
 			$this->accountService,
 			$this->mailSearch,
+			$this->delegationService,
 		);
 
 		$this->accountService->expects(self::never())

tests/Unit/Controller/MailboxesControllerTest.php

@@ -18,6 +18,7 @@
 use OCA\Mail\Folder;
 use OCA\Mail\IMAP\MailboxStats;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\DelegationService;
 use OCA\Mail\Service\Sync\SyncService;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -49,6 +50,7 @@ class MailboxesControllerTest extends TestCase {
 
 	private IConfig|MockObject $config;
 	private ITimeFactory|MockObject $timeFactory;
+	private DelegationService|MockObject $delegationService;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -59,6 +61,9 @@ public function setUp(): void {
 		$this->syncService = $this->createMock(SyncService::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
+		$this->delegationService = $this->createMock(DelegationService::class);
+		$this->delegationService->method('resolveAccountUserId')->willReturn($this->userId);
+		$this->delegationService->method('resolveMailboxUserId')->willReturn($this->userId);
 
 		$this->controller = new MailboxesController(
 			$this->appName,
@@ -68,7 +73,8 @@ public function setUp(): void {
 			$this->mailManager,
 			$this->syncService,
 			$this->config,
-			$this->timeFactory
+			$this->timeFactory,
+			$this->delegationService,
 		);
 	}
 

tests/Unit/Controller/MessageApiControllerTest.php

@@ -27,6 +27,7 @@
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AliasesService;
 use OCA\Mail\Service\Attachment\AttachmentService;
+use OCA\Mail\Service\DelegationService;
 use OCA\Mail\Service\DkimService;
 use OCA\Mail\Service\ItineraryService;
 use OCA\Mail\Service\MailManager;
@@ -58,6 +59,7 @@ class MessageApiControllerTest extends TestCase {
 	private DkimService|MockObject $dkimService;
 	private MockObject|ItineraryService $itineraryService;
 	private TrustedSenderService|MockObject $trustedSenderService;
+	private DelegationService|MockObject $delegationService;
 	private MessageApiController $controller;
 	private string $fromEmail = 'john@test.com';
 	private int $accountId = 1;
@@ -84,6 +86,9 @@ protected function setUp(): void {
 		$this->dkimService = $this->createMock(DkimService::class);
 		$this->itineraryService = $this->createMock(ItineraryService::class);
 		$this->trustedSenderService = $this->createMock(TrustedSenderService::class);
+		$this->delegationService = $this->createMock(DelegationService::class);
+		$this->delegationService->method('resolveAccountUserId')->willReturn($this->userId);
+		$this->delegationService->method('resolveMessageUserId')->willReturn($this->userId);
 
 		$this->controller = new MessageApiController($this->appName,
 			$this->userId,
@@ -100,6 +105,7 @@ protected function setUp(): void {
 			$this->dkimService,
 			$this->itineraryService,
 			$this->trustedSenderService,
+			$this->delegationService,
 		);
 
 		$mailAccount = new MailAccount();

tests/Unit/Controller/MessagesControllerTest.php

@@ -37,6 +37,7 @@
 use OCA\Mail\Model\Message;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AiIntegrations\AiIntegrationsService;
+use OCA\Mail\Service\DelegationService;
 use OCA\Mail\Service\ItineraryService;
 use OCA\Mail\Service\MailManager;
 use OCA\Mail\Service\SmimeService;
@@ -134,6 +135,8 @@ class MessagesControllerTest extends TestCase {
 
 	private ICacheFactory&MockObject $cacheFactory;
 
+	private DelegationService|MockObject $delegationService;
+
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -164,6 +167,10 @@ protected function setUp(): void {
 		$this->cacheFactory->method('createDistributed')
 			->willReturn(new NullCache());
 
+		$this->delegationService = $this->createMock(DelegationService::class);
+		$this->delegationService->method('resolveMessageUserId')->willReturn($this->userId);
+		$this->delegationService->method('resolveMailboxUserId')->willReturn($this->userId);
+
 		$timeFactory = $this->createMocK(ITimeFactory::class);
 		$timeFactory->expects($this->any())
 			->method('getTime')
@@ -194,6 +201,7 @@ protected function setUp(): void {
 			$this->snoozeService,
 			$this->aiIntegrationsService,
 			$this->cacheFactory,
+			$this->delegationService,
 		);
 
 		$this->account = $this->createMock(Account::class);
@@ -1249,6 +1257,7 @@ public function testNeedsTranslationNoUser() {
 			$this->snoozeService,
 			$this->aiIntegrationsService,
 			$this->cacheFactory,
+			$this->delegationService,
 		);
 
 		$actualResponse = $controller->needsTranslation(100);
@@ -1421,6 +1430,7 @@ public function testSmartReplyNoUser(): void {
 			$this->snoozeService,
 			$this->aiIntegrationsService,
 			$this->cacheFactory,
+			$this->delegationService,
 		);
 
 		$actualResponse = $controller->smartReply(100);