-
Notifications
You must be signed in to change notification settings - Fork 262
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
feat: One-click unsubscribe #8438
Merged
Merged
Changes from all commits
Commits
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 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 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,112 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/* | ||
* @copyright 2023 Christoph Wurst <[email protected]> | ||
* | ||
* @author 2023 Christoph Wurst <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
namespace OCA\Mail\Controller; | ||
|
||
use Exception; | ||
use OCA\Mail\AppInfo\Application; | ||
use OCA\Mail\Contracts\IMailManager; | ||
use OCA\Mail\Http\JsonResponse; | ||
use OCA\Mail\IMAP\IMAPClientFactory; | ||
use OCA\Mail\Service\AccountService; | ||
use OCP\AppFramework\Controller; | ||
use OCP\AppFramework\Db\DoesNotExistException; | ||
use OCP\AppFramework\Http; | ||
use OCP\Http\Client\IClientService; | ||
use OCP\IRequest; | ||
use Psr\Log\LoggerInterface; | ||
|
||
class ListController extends Controller { | ||
private IMailManager $mailManager; | ||
private AccountService $accountService; | ||
private IMAPClientFactory $clientFactory; | ||
private IClientService $httpClientService; | ||
private LoggerInterface $logger; | ||
private ?string $currentUserId; | ||
|
||
public function __construct(IRequest $request, | ||
IMailManager $mailManager, | ||
AccountService $accountService, | ||
IMAPClientFactory $clientFactory, | ||
IClientService $httpClientService, | ||
LoggerInterface $logger, | ||
?string $userId) { | ||
parent::__construct(Application::APP_ID, $request); | ||
$this->mailManager = $mailManager; | ||
$this->accountService = $accountService; | ||
$this->clientFactory = $clientFactory; | ||
$this->request = $request; | ||
$this->httpClientService = $httpClientService; | ||
$this->logger = $logger; | ||
$this->currentUserId = $userId; | ||
} | ||
|
||
/** | ||
* @param int $messageId | ||
* @NoAdminRequired | ||
* @UserRateThrottle(limit=10, period=3600) | ||
* @return JsonResponse | ||
*/ | ||
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()); | ||
} catch (DoesNotExistException $e) { | ||
return JsonResponse::fail(null, Http::STATUS_NOT_FOUND); | ||
} | ||
|
||
$client = $this->clientFactory->getClient($account); | ||
try { | ||
$imapMessage = $this->mailManager->getImapMessage( | ||
$client, | ||
$account, | ||
$mailbox, | ||
$message->getUid(), | ||
true | ||
); | ||
$unsubscribeUrl = $imapMessage->getUnsubscribeUrl(); | ||
if ($unsubscribeUrl === null || !$imapMessage->isOneClickUnsubscribe()) { | ||
return JsonResponse::fail(null, Http::STATUS_FORBIDDEN); | ||
} | ||
|
||
$httpClient = $this->httpClientService->newClient(); | ||
$httpClient->post($unsubscribeUrl, [ | ||
'body' => [ | ||
'List-Unsubscribe' => 'One-Click' | ||
] | ||
]); | ||
} catch (Exception $e) { | ||
$this->logger->error('Could not unsubscribe mailing list', [ | ||
'exception' => $e, | ||
]); | ||
return JsonResponse::error('Unknown error'); | ||
} finally { | ||
$client->logout(); | ||
} | ||
|
||
return JsonResponse::success(); | ||
} | ||
} |
This file contains 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 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 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 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,31 @@ | ||
/** | ||
* @copyright 2023 Christoph Wurst <[email protected]> | ||
* | ||
* @author 2023 Christoph Wurst <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
import axios from '@nextcloud/axios' | ||
import { generateUrl } from '@nextcloud/router' | ||
|
||
export async function unsubscribe(id) { | ||
const url = generateUrl('/apps/mail/api/list/unsubscribe/{id}', { | ||
id, | ||
}) | ||
|
||
axios.post(url) | ||
} |
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.
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.
nit: early return would lead to better readability here and save about 3 brackets 😉
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.
Thanks. I will take that into account for the follow-up to add the DKIM signature validation.