-
Notifications
You must be signed in to change notification settings - Fork 0
feat(HDNEXT-1010): intercept file-request send-email via IONOS mailer API #17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
27cd439
chore(composer): update nextcloud/ocp to version v33.0.5 in composer.…
printminion-co 7a7ad6a
chore(composer): update nextcloud/coding-standard to version v1.5.0 i…
printminion-co c8bdbcb
chore(composer): update dependencies in composer.lock to latest versions
printminion-co fbce3b2
chore(composer): update guzzlehttp/guzzle to version 7.10.6 and phpun…
printminion-co cccd167
feat(listener): replace ShareCreatedEventListener with BeforeShareMai…
printminion-co 56d9e73
refactor(listener): use typed getters on BeforeShareMailSentEvent (HD…
printminion-co 18a6428
fix(listener): register BeforeShareMailSentEventListener unconditionally
tanyaka d174f98
fix(ci): fix php-cs and psalm CI failures
tanyaka 4ae7e36
test(listener): add tests for unrelated event, multiple recipients, a…
tanyaka File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,75 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 STRATO GmbH | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\IonosProcesses\Listener; | ||
|
|
||
| use OCA\IonosProcesses\Service\IonosMailerService; | ||
| use OCA\ShareByMail\Event\BeforeShareMailSentEvent; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\IL10N; | ||
| use OCP\Share\IShare; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| /** | ||
| * Intercepts BeforeShareMailSentEvent fired by ShareByMailProvider::sendEmail() | ||
| * and routes share notifications through the internal IONOS mail delivery API. | ||
| * | ||
| * Calls markMailHandled() unconditionally in every TYPE_EMAIL code path so the | ||
| * native Nextcloud SMTP send is suppressed. IONOS send failures propagate as | ||
| * exceptions — no silent fallback to SMTP. | ||
| * | ||
| * Non-TYPE_EMAIL share types are not marked handled, so their native send still runs. | ||
| * | ||
| * @psalm-api | ||
| * @implements IEventListener<BeforeShareMailSentEvent> | ||
| */ | ||
| class BeforeShareMailSentEventListener implements IEventListener { | ||
| public const EVENT_NAME_SHARE_BY_LINK = 'share-by-link'; | ||
|
|
||
| /** @psalm-api */ | ||
| public function __construct( | ||
| private readonly LoggerInterface $logger, | ||
| private readonly IL10N $l10n, | ||
| private readonly IonosMailerService $mailer, | ||
| ) { | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!($event instanceof BeforeShareMailSentEvent)) { | ||
| return; | ||
| } | ||
|
|
||
| $share = $event->getShare(); | ||
|
|
||
| if ($share->getShareType() !== IShare::TYPE_EMAIL) { | ||
| return; | ||
| } | ||
|
|
||
| $resolvedEmails = $event->getResolvedEmails(); | ||
| if (empty($resolvedEmails)) { | ||
| $event->markMailHandled(); | ||
| $this->logger->warning("empty recipients for share with token '" . $share->getToken() . "', skipping"); | ||
| return; | ||
| } | ||
|
|
||
| $data = [ | ||
| 'senderUserId' => $event->getSenderUserId(), | ||
| 'fileName' => $event->getFileName(), | ||
| 'resourceUrl' => $event->getResourceUrl(), | ||
| 'note' => $event->getNote(), | ||
| 'expirationDate' => $event->getExpiration()?->getTimestamp(), | ||
| 'language' => $this->l10n->getLanguageCode(), | ||
| 'receiverEmails' => $resolvedEmails, | ||
| ]; | ||
|
|
||
| $event->markMailHandled(); | ||
| $this->mailer->send(self::EVENT_NAME_SHARE_BY_LINK, $data); | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
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.