feat: add notifications for account delegation #12935
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\Mail\Tests\Unit\Notification; | ||
|
|
||
| use ChristophWurst\Nextcloud\Testing\TestCase; | ||
| use OCA\Mail\Notification\Notifier; | ||
| use OCP\IL10N; | ||
| use OCP\IURLGenerator; | ||
| use OCP\L10N\IFactory; | ||
| use OCP\Notification\INotification; | ||
| use OCP\Notification\UnknownNotificationException; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
|
|
||
| class NotifierTest extends TestCase { | ||
| private IFactory&MockObject $factory; | ||
| private IURLGenerator&MockObject $url; | ||
| private IL10N&MockObject $l10n; | ||
| private Notifier $notifier; | ||
|
|
||
| protected function setUp(): void { | ||
| parent::setUp(); | ||
|
|
||
| $this->factory = $this->createMock(IFactory::class); | ||
| $this->url = $this->createMock(IURLGenerator::class); | ||
| $this->l10n = $this->createMock(IL10N::class); | ||
| $this->l10n->method('t')->willReturnArgument(0); | ||
| $this->factory->method('get')->willReturn($this->l10n); | ||
|
|
||
| $this->notifier = new Notifier($this->factory, $this->url); | ||
| } | ||
|
|
||
| public function testGetID(): void { | ||
| $this->assertEquals('mail', $this->notifier->getID()); | ||
| } | ||
|
|
||
| public function testGetName(): void { | ||
| $this->assertEquals('Mail', $this->notifier->getName()); | ||
| } | ||
|
|
||
| public function testPrepareForeignAppThrows(): void { | ||
| $notification = $this->createMock(INotification::class); | ||
| $notification->method('getApp')->willReturn('other'); | ||
|
|
||
| $this->expectException(UnknownNotificationException::class); | ||
|
|
||
| $this->notifier->prepare($notification, 'en'); | ||
| } | ||
|
|
||
| public function testPrepareUnknownSubjectThrows(): void { | ||
| $notification = $this->createMock(INotification::class); | ||
| $notification->method('getApp')->willReturn('mail'); | ||
| $notification->method('getSubject')->willReturn('something_unknown'); | ||
|
|
||
| $this->expectException(UnknownNotificationException::class); | ||
|
|
||
| $this->notifier->prepare($notification, 'en'); | ||
| } | ||
|
|
||
| public function testPrepareAccountDelegationDelegated(): void { | ||
| $notification = $this->createMock(INotification::class); | ||
| $notification->method('getApp')->willReturn('mail'); | ||
| $notification->method('getSubject')->willReturn('account_delegation'); | ||
| $notification->method('getSubjectParameters')->willReturn([ | ||
| 'id' => 1, | ||
| 'account_email' => 'owner@example.com', | ||
| ]); | ||
| $notification->method('getMessageParameters')->willReturn([ | ||
| 'id' => 1, | ||
| 'delegated' => true, | ||
| 'current_user_id' => 'owner', | ||
| 'current_user_display_name' => 'Owner User', | ||
| 'account_email' => 'owner@example.com', | ||
| ]); | ||
|
|
||
| $this->url->method('linkTo')->with('mail', 'img/delegation.svg')->willReturn('/apps/mail/img/delegation.svg'); | ||
| $this->url->method('getAbsoluteURL')->with('/apps/mail/img/delegation.svg')->willReturn('https://example.com/apps/mail/img/delegation.svg'); | ||
|
|
||
| $notification->expects($this->once()) | ||
| ->method('setIcon') | ||
| ->with('https://example.com/apps/mail/img/delegation.svg') | ||
| ->willReturnSelf(); | ||
| $notification->expects($this->once()) | ||
| ->method('setRichSubject') | ||
| ->with( | ||
| '{account_email} has been delegated to you', | ||
| [ | ||
| 'account_email' => [ | ||
| 'type' => 'highlight', | ||
| 'id' => '1', | ||
| 'name' => 'owner@example.com', | ||
| ], | ||
| ] | ||
| ) | ||
| ->willReturnSelf(); | ||
| $notification->expects($this->once()) | ||
| ->method('setRichMessage') | ||
| ->with( | ||
| '{user} delegated {account} to you', | ||
| [ | ||
| 'user' => [ | ||
| 'type' => 'user', | ||
| 'id' => 'owner', | ||
| 'name' => 'Owner User', | ||
| ], | ||
| 'account' => [ | ||
| 'type' => 'highlight', | ||
| 'id' => '1', | ||
| 'name' => 'owner@example.com', | ||
| ], | ||
| ] | ||
| ) | ||
| ->willReturnSelf(); | ||
|
|
||
| $result = $this->notifier->prepare($notification, 'en'); | ||
|
|
||
| $this->assertSame($notification, $result); | ||
| } | ||
|
|
||
| public function testPrepareAccountDelegationRevoked(): void { | ||
| $notification = $this->createMock(INotification::class); | ||
| $notification->method('getApp')->willReturn('mail'); | ||
| $notification->method('getSubject')->willReturn('account_delegation'); | ||
| $notification->method('getSubjectParameters')->willReturn([ | ||
| 'id' => 1, | ||
| 'account_email' => 'owner@example.com', | ||
| ]); | ||
| $notification->method('getMessageParameters')->willReturn([ | ||
| 'id' => 1, | ||
| 'delegated' => false, | ||
| 'current_user_id' => 'owner', | ||
| 'current_user_display_name' => 'Owner User', | ||
| 'account_email' => 'owner@example.com', | ||
| ]); | ||
|
|
||
| $this->url->method('linkTo')->with('mail', 'img/delegation.svg')->willReturn('/apps/mail/img/delegation.svg'); | ||
| $this->url->method('getAbsoluteURL')->with('/apps/mail/img/delegation.svg')->willReturn('https://example.com/apps/mail/img/delegation.svg'); | ||
|
|
||
| $notification->expects($this->once()) | ||
| ->method('setIcon') | ||
| ->with('https://example.com/apps/mail/img/delegation.svg') | ||
| ->willReturnSelf(); | ||
| $notification->expects($this->once()) | ||
| ->method('setRichSubject') | ||
| ->with( | ||
| '{account_email} is no longer delegated to you', | ||
| [ | ||
| 'account_email' => [ | ||
| 'type' => 'highlight', | ||
| 'id' => '1', | ||
| 'name' => 'owner@example.com', | ||
| ], | ||
| ] | ||
| ) | ||
| ->willReturnSelf(); | ||
| $notification->expects($this->once()) | ||
| ->method('setRichMessage') | ||
| ->with( | ||
| '{user} revoked delagation for {account}', | ||
| [ | ||
| 'user' => [ | ||
| 'type' => 'user', | ||
| 'id' => 'owner', | ||
| 'name' => 'Owner User', | ||
| ], | ||
| 'account' => [ | ||
| 'type' => 'highlight', | ||
| 'id' => '1', | ||
| 'name' => 'owner@example.com', | ||
| ], | ||
| ] | ||
| ) | ||
| ->willReturnSelf(); | ||
|
|
||
| $result = $this->notifier->prepare($notification, 'en'); | ||
|
|
||
| $this->assertSame($notification, $result); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix the user-facing typo in revoked delegation message.
Line 111 uses
delagation, which will surface incorrect text in notifications.Proposed fix
📝 Committable suggestion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to fix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hamza221— The PR description image also confirms the typo is visible in the live notification UI ("revoked delagation for hamza@nextdev.app"). Thanks for flagging it for a fix — just correctdelagation→delegationon Line 111 when you get to it.