Skip to content

Commit cce92cc

Browse files
SebastianKrupinskiSebastianKrupinski
committed
fixup! feat: mail provider settings
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
1 parent fb82d6c commit cce92cc

9 files changed

Lines changed: 148 additions & 135 deletions

File tree

‎apps/dav/lib/CalDAV/Schedule/IMipPlugin.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use OCA\DAV\CalDAV\EventComparisonService;
1313
use OCP\AppFramework\Utility\ITimeFactory;
1414
use OCP\Defaults;
15-
use OCP\IConfig;
15+
use OCP\IAppConfig;
1616
use OCP\IUserSession;
1717
use OCP\Mail\IMailer;
1818
use OCP\Mail\Provider\IManager as IMailManager;
@@ -44,7 +44,7 @@
4444
*/
4545
class IMipPlugin extends SabreIMipPlugin {
4646
private IUserSession $userSession;
47-
private IConfig $config;
47+
private IAppConfig $config;
4848
private IMailer $mailer;
4949
private LoggerInterface $logger;
5050
private ITimeFactory $timeFactory;
@@ -59,7 +59,7 @@ class IMipPlugin extends SabreIMipPlugin {
5959
private EventComparisonService $eventComparisonService;
6060
private IMailManager $mailManager;
6161

62-
public function __construct(IConfig $config,
62+
public function __construct(IAppConfig $config,
6363
IMailer $mailer,
6464
LoggerInterface $logger,
6565
ITimeFactory $timeFactory,
@@ -246,7 +246,7 @@ public function schedule(Message $iTipMessage) {
246246
*/
247247

248248
$recipientDomain = substr(strrchr($recipient, '@'), 1);
249-
$invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getAppValue('dav', 'invitation_link_recipients', 'yes'))));
249+
$invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getValueString('dav', 'invitation_link_recipients', 'yes'))));
250250

251251
if (strcmp('yes', $invitationLinkRecipients[0]) === 0
252252
|| in_array(strtolower($recipient), $invitationLinkRecipients)
@@ -265,7 +265,7 @@ public function schedule(Message $iTipMessage) {
265265
$mailService = null;
266266

267267
try {
268-
if ($this->config->getSystemValueInt('mail_providers_disabled', 0) === 0) {
268+
if ($this->config->getValueInt('core','mail_providers_disabled', 0) === 0) {
269269
// retrieve user object
270270
$user = $this->userSession->getUser();
271271
// evaluate if user object exist

‎apps/dav/lib/Server.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public function __construct(IRequest $request, string $baseUri) {
293293
));
294294
if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
295295
$this->server->addPlugin(new IMipPlugin(
296-
\OC::$server->get(\OCP\IConfig::class),
296+
\OC::$server->get(\OCP\IAppConfig::class),
297297
\OC::$server->get(\OCP\Mail\IMailer::class),
298298
\OC::$server->get(LoggerInterface::class),
299299
\OC::$server->get(\OCP\AppFramework\Utility\ITimeFactory::class),

‎apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use OCA\DAV\CalDAV\Schedule\IMipService;
1212
use OCP\AppFramework\Utility\ITimeFactory;
1313
use OCP\Defaults;
14-
use OCP\IConfig;
14+
use OCP\IAppConfig;
1515
use OCP\IUser;
1616
use OCP\IUserSession;
1717
use OCP\Mail\IAttachment;
@@ -52,7 +52,7 @@ class IMipPluginTest extends TestCase {
5252
/** @var ITimeFactory|MockObject */
5353
private $timeFactory;
5454

55-
/** @var IConfig|MockObject */
55+
/** @var IAppConfig|MockObject */
5656
private $config;
5757

5858
/** @var IUserSession|MockObject */
@@ -105,7 +105,7 @@ protected function setUp(): void {
105105
$this->timeFactory = $this->createMock(ITimeFactory::class);
106106
$this->timeFactory->method('getTime')->willReturn(1496912528); // 2017-01-01
107107

108-
$this->config = $this->createMock(IConfig::class);
108+
$this->config = $this->createMock(IAppConfig::class);
109109

110110
$this->user = $this->createMock(IUser::class);
111111

@@ -243,7 +243,7 @@ public function testParsingSingle(): void {
243243
->method('getAttendeeRsvpOrReqForParticipant')
244244
->willReturn(true);
245245
$this->config->expects(self::once())
246-
->method('getAppValue')
246+
->method('getValueString')
247247
->with('dav', 'invitation_link_recipients', 'yes')
248248
->willReturn('yes');
249249
$this->service->expects(self::once())
@@ -341,7 +341,7 @@ public function testAttendeeIsResource(): void {
341341
$this->service->expects(self::never())
342342
->method('getAttendeeRsvpOrReqForParticipant');
343343
$this->config->expects(self::never())
344-
->method('getAppValue');
344+
->method('getValueString');
345345
$this->service->expects(self::never())
346346
->method('createInvitationToken');
347347
$this->service->expects(self::never())
@@ -447,7 +447,7 @@ public function testParsingRecurrence(): void {
447447
->method('getAttendeeRsvpOrReqForParticipant')
448448
->willReturn(true);
449449
$this->config->expects(self::once())
450-
->method('getAppValue')
450+
->method('getValueString')
451451
->with('dav', 'invitation_link_recipients', 'yes')
452452
->willReturn('yes');
453453
$this->service->expects(self::once())
@@ -578,7 +578,7 @@ public function testFailedDelivery(): void {
578578
->method('getAttendeeRsvpOrReqForParticipant')
579579
->willReturn(true);
580580
$this->config->expects(self::once())
581-
->method('getAppValue')
581+
->method('getValueString')
582582
->with('dav', 'invitation_link_recipients', 'yes')
583583
->willReturn('yes');
584584
$this->service->expects(self::once())
@@ -633,7 +633,7 @@ public function testMailProviderSend(): void {
633633
];
634634
// construct system config mock returns
635635
$this->config->expects(self::once())
636-
->method('getAppValue')
636+
->method('getValueString')
637637
->with('dav', 'invitation_link_recipients', 'yes')
638638
->willReturn('yes');
639639
// construct user mock returns
@@ -791,12 +791,12 @@ public function testMailProviderDisabled(): void {
791791
->method('getAttendeeRsvpOrReqForParticipant')
792792
->willReturn(true);
793793
$this->config->expects(self::once())
794-
->method('getAppValue')
794+
->method('getValueString')
795795
->with('dav', 'invitation_link_recipients', 'yes')
796796
->willReturn('yes');
797797
$this->config->expects(self::once())
798-
->method('getSystemValueInt')
799-
->with('mail_providers_disabled', 0)
798+
->method('getValueInt')
799+
->with('core','mail_providers_disabled', 0)
800800
->willReturn(1);
801801
$this->service->expects(self::once())
802802
->method('createInvitationToken')
@@ -886,7 +886,7 @@ public function testNoOldEvent(): void {
886886
->method('getAttendeeRsvpOrReqForParticipant')
887887
->willReturn(true);
888888
$this->config->expects(self::once())
889-
->method('getAppValue')
889+
->method('getValueString')
890890
->with('dav', 'invitation_link_recipients', 'yes')
891891
->willReturn('yes');
892892
$this->service->expects(self::once())
@@ -979,7 +979,7 @@ public function testNoButtons(): void {
979979
->method('getAttendeeRsvpOrReqForParticipant')
980980
->willReturn(true);
981981
$this->config->expects(self::once())
982-
->method('getAppValue')
982+
->method('getValueString')
983983
->with('dav', 'invitation_link_recipients', 'yes')
984984
->willReturn('no');
985985
$this->service->expects(self::never())

‎apps/settings/composer/composer/autoload_classmap.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
'OCA\\Settings\\Hooks' => $baseDir . '/../lib/Hooks.php',
4141
'OCA\\Settings\\Listener\\AppPasswordCreatedActivityListener' => $baseDir . '/../lib/Listener/AppPasswordCreatedActivityListener.php',
4242
'OCA\\Settings\\Listener\\GroupRemovedListener' => $baseDir . '/../lib/Listener/GroupRemovedListener.php',
43-
'OCA\\Settings\\Listener\\MailSettingsEventListener' => $baseDir . '/../lib/Listener/MailSettingsEventListener.php',
43+
'OCA\\Settings\\Listener\\SystemMailSettingsListener' => $baseDir . '/../lib/Listener/SystemMailSettingsListener.php',
4444
'OCA\\Settings\\Listener\\UserAddedToGroupActivityListener' => $baseDir . '/../lib/Listener/UserAddedToGroupActivityListener.php',
4545
'OCA\\Settings\\Listener\\UserRemovedFromGroupActivityListener' => $baseDir . '/../lib/Listener/UserRemovedFromGroupActivityListener.php',
4646
'OCA\\Settings\\Mailer\\NewUserMailHelper' => $baseDir . '/../lib/Mailer/NewUserMailHelper.php',
@@ -72,6 +72,7 @@
7272
'OCA\\Settings\\Settings\\Admin\\Security' => $baseDir . '/../lib/Settings/Admin/Security.php',
7373
'OCA\\Settings\\Settings\\Admin\\Server' => $baseDir . '/../lib/Settings/Admin/Server.php',
7474
'OCA\\Settings\\Settings\\Admin\\Sharing' => $baseDir . '/../lib/Settings/Admin/Sharing.php',
75+
'OCA\\Settings\\Settings\\Admin\\SystemMail' => $baseDir . '/../lib/Settings/Admin/SystemMail.php',
7576
'OCA\\Settings\\Settings\\Admin\\Users' => $baseDir . '/../lib/Settings/Admin/Users.php',
7677
'OCA\\Settings\\Settings\\Personal\\Additional' => $baseDir . '/../lib/Settings/Personal/Additional.php',
7778
'OCA\\Settings\\Settings\\Personal\\PersonalInfo' => $baseDir . '/../lib/Settings/Personal/PersonalInfo.php',

‎apps/settings/composer/composer/autoload_static.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ComposerStaticInitSettings
5555
'OCA\\Settings\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
5656
'OCA\\Settings\\Listener\\AppPasswordCreatedActivityListener' => __DIR__ . '/..' . '/../lib/Listener/AppPasswordCreatedActivityListener.php',
5757
'OCA\\Settings\\Listener\\GroupRemovedListener' => __DIR__ . '/..' . '/../lib/Listener/GroupRemovedListener.php',
58-
'OCA\\Settings\\Listener\\MailSettingsEventListener' => __DIR__ . '/..' . '/../lib/Listener/MailSettingsEventListener.php',
58+
'OCA\\Settings\\Listener\\SystemMailSettingsListener' => __DIR__ . '/..' . '/../lib/Listener/SystemMailSettingsListener.php',
5959
'OCA\\Settings\\Listener\\UserAddedToGroupActivityListener' => __DIR__ . '/..' . '/../lib/Listener/UserAddedToGroupActivityListener.php',
6060
'OCA\\Settings\\Listener\\UserRemovedFromGroupActivityListener' => __DIR__ . '/..' . '/../lib/Listener/UserRemovedFromGroupActivityListener.php',
6161
'OCA\\Settings\\Mailer\\NewUserMailHelper' => __DIR__ . '/..' . '/../lib/Mailer/NewUserMailHelper.php',
@@ -87,6 +87,7 @@ class ComposerStaticInitSettings
8787
'OCA\\Settings\\Settings\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Settings/Admin/Security.php',
8888
'OCA\\Settings\\Settings\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Settings/Admin/Server.php',
8989
'OCA\\Settings\\Settings\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Settings/Admin/Sharing.php',
90+
'OCA\\Settings\\Settings\\Admin\\SystemMail' => __DIR__ . '/..' . '/../lib/Settings/Admin/SystemMail.php',
9091
'OCA\\Settings\\Settings\\Admin\\Users' => __DIR__ . '/..' . '/../lib/Settings/Admin/Users.php',
9192
'OCA\\Settings\\Settings\\Personal\\Additional' => __DIR__ . '/..' . '/../lib/Settings/Personal/Additional.php',
9293
'OCA\\Settings\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Settings/Personal/PersonalInfo.php',

‎apps/settings/lib/AppInfo/Application.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
use OCA\Settings\Hooks;
1616
use OCA\Settings\Listener\AppPasswordCreatedActivityListener;
1717
use OCA\Settings\Listener\GroupRemovedListener;
18-
use OCA\Settings\Listener\MailSettingsEventListener;
18+
use OCA\Settings\Listener\SystemMailSettingsListener;
1919
use OCA\Settings\Listener\UserAddedToGroupActivityListener;
2020
use OCA\Settings\Listener\UserRemovedFromGroupActivityListener;
2121
use OCA\Settings\Mailer\NewUserMailHelper;
2222
use OCA\Settings\Middleware\SubadminMiddleware;
2323
use OCA\Settings\Search\AppSearch;
2424
use OCA\Settings\Search\SectionSearch;
2525
use OCA\Settings\Search\UserSearch;
26+
use OCA\Settings\Settings\Admin\SystemMail;
2627
use OCA\Settings\SetupChecks\AllowedAdminRanges;
2728
use OCA\Settings\SetupChecks\AppDirsWithDifferentOwner;
2829
use OCA\Settings\SetupChecks\BruteForceThrottler;
@@ -86,7 +87,6 @@
8687
use OCP\Group\Events\UserRemovedEvent;
8788
use OCP\IServerContainer;
8889
use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
89-
use OCP\Settings\Events\DeclarativeSettingsRegisterFormEvent;
9090
use OCP\Settings\Events\DeclarativeSettingsSetValueEvent;
9191
use OCP\Settings\IManager;
9292
use OCP\Util;
@@ -114,15 +114,18 @@ public function register(IRegistrationContext $context): void {
114114
$context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
115115
$context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
116116
$context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class);
117-
// Register Mail Settings listeners
118-
$context->registerEventListener(DeclarativeSettingsRegisterFormEvent::class, MailSettingsEventListener::class);
119-
$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, MailSettingsEventListener::class);
120-
$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, MailSettingsEventListener::class);
117+
118+
// Register SystemMail listeners
119+
$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, SystemMailSettingsListener::class);
120+
$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, SystemMailSettingsListener::class);
121121

122122
// Register well-known handlers
123123
$context->registerWellKnownHandler(SecurityTxtHandler::class);
124124
$context->registerWellKnownHandler(ChangePasswordHandler::class);
125125

126+
// Register Settings Form(s)
127+
$context->registerDeclarativeSettings(SystemMail::class);
128+
126129
/**
127130
* Core class wrappers
128131
*/

‎apps/settings/lib/Listener/MailSettingsEventListener.php‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)