fixup! feat: mail provider settings

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

@@ -265,12 +265,14 @@ public function schedule(Message $iTipMessage) {
 		$mailService = null;
 
 		try {
-			// retrieve user object
-			$user = $this->userSession->getUser();
-			// evaluate if user object exist
-			if ($user !== null) {
-				// retrieve appropriate service with the same address as sender
-				$mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);
+			if ($this->config->getSystemValueInt('mail_providers_disabled', 0) === 0) {
+				// retrieve user object
+				$user = $this->userSession->getUser();
+				// evaluate if user object exist
+				if ($user !== null) {
+					// retrieve appropriate service with the same address as sender
+					$mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);
+				}
 			}
 			// evaluate if a mail service was found and has sending capabilities
 			if ($mailService !== null && $mailService instanceof IMessageSend) {

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

@@ -708,6 +708,113 @@ public function testMailProviderSend(): void {
 		$this->assertEquals('1.1', $message->getScheduleStatus());
 	}
 
+	public function testMailProviderDisabled(): void {
+		$message = new Message();
+		$message->method = 'REQUEST';
+		$newVCalendar = new VCalendar();
+		$newVevent = new VEvent($newVCalendar, 'one', array_merge([
+			'UID' => 'uid-1234',
+			'SEQUENCE' => 1,
+			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+		], []));
+		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$message->message = $newVCalendar;
+		$message->sender = 'mailto:gandalf@wiz.ard';
+		$message->senderName = 'Mr. Wizard';
+		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		// save the old copy in the plugin
+		$oldVCalendar = new VCalendar();
+		$oldVEvent = new VEvent($oldVCalendar, 'one', [
+			'UID' => 'uid-1234',
+			'SEQUENCE' => 0,
+			'SUMMARY' => 'Fellowship meeting',
+			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+		]);
+		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVCalendar->add($oldVEvent);
+		$data = ['invitee_name' => 'Mr. Wizard',
+			'meeting_title' => 'Fellowship meeting without (!) Boromir',
+			'attendee_name' => 'frodo@hobb.it'
+		];
+		$attendees = $newVevent->select('ATTENDEE');
+		$atnd = '';
+		foreach ($attendees as $attendee) {
+			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+				$atnd = $attendee;
+			}
+		}
+		$this->plugin->setVCalendar($oldVCalendar);
+		$this->service->expects(self::once())
+			->method('getLastOccurrence')
+			->willReturn(1496912700);
+		$this->mailer->expects(self::once())
+			->method('validateMailAddress')
+			->with('frodo@hobb.it')
+			->willReturn(true);
+		$this->eventComparisonService->expects(self::once())
+			->method('findModified')
+			->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
+		$this->service->expects(self::once())
+			->method('getCurrentAttendee')
+			->with($message)
+			->willReturn($atnd);
+		$this->service->expects(self::once())
+			->method('isRoomOrResource')
+			->with($atnd)
+			->willReturn(false);
+		$this->service->expects(self::once())
+			->method('buildBodyData')
+			->with($newVevent, $oldVEvent)
+			->willReturn($data);
+		$this->user->expects(self::any())
+			->method('getUID')
+			->willReturn('user1');
+		$this->user->expects(self::any())
+			->method('getDisplayName')
+			->willReturn('Mr. Wizard');
+		$this->userSession->expects(self::any())
+			->method('getUser')
+			->willReturn($this->user);
+		$this->service->expects(self::once())
+			->method('getFrom');
+		$this->service->expects(self::once())
+			->method('addSubjectAndHeading')
+			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', true);
+		$this->service->expects(self::once())
+			->method('addBulletList')
+			->with($this->emailTemplate, $newVevent, $data);
+		$this->service->expects(self::once())
+			->method('getAttendeeRsvpOrReqForParticipant')
+			->willReturn(true);
+		$this->config->expects(self::once())
+			->method('getAppValue')
+			->with('dav', 'invitation_link_recipients', 'yes')
+			->willReturn('yes');
+		$this->config->expects(self::once())
+			->method('getSystemValueInt')
+			->with('mail_providers_disabled', 0)
+			->willReturn(1);
+		$this->service->expects(self::once())
+			->method('createInvitationToken')
+			->with($message, $newVevent, 1496912700)
+			->willReturn('token');
+		$this->service->expects(self::once())
+			->method('addResponseButtons')
+			->with($this->emailTemplate, 'token');
+		$this->service->expects(self::once())
+			->method('addMoreOptionsButton')
+			->with($this->emailTemplate, 'token');
+		$this->mailer->expects(self::once())
+			->method('send')
+			->willReturn([]);
+		$this->plugin->schedule($message);
+		$this->assertEquals('1.1', $message->getScheduleStatus());
+	}
+
 	public function testNoOldEvent(): void {
 		$message = new Message();
 		$message->method = 'REQUEST';

apps/settings/lib/AppInfo/Application.php

@@ -84,6 +84,9 @@
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\Group\Events\UserAddedEvent;
 use OCP\Group\Events\UserRemovedEvent;
+use OCP\Settings\Events\DeclarativeSettingsRegisterFormEvent;
+use OCP\Settings\Events\DeclarativeSettingsSetValueEvent;
+use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
 use OCP\IServerContainer;
 use OCP\Settings\IManager;
 use OCP\Util;

apps/settings/lib/Listener/MailSettingsEventListener.php

@@ -28,20 +28,23 @@ public function __construct(
 
 	public function handle(Event $event): void {
 
-		if ($event->getApp() !== Application::APP_ID) {
+		if ($event instanceof DeclarativeSettingsRegisterFormEvent) {
+			$this->handleRegister($event);
 			return;
 		}
 
-		if ($event instanceof DeclarativeSettingsRegisterFormEvent) {
-			$this->handleRegister($event);
+		if ($event->getApp() !== Application::APP_ID) {
+			return;
 		}
 
 		if ($event instanceof DeclarativeSettingsGetValueEvent) {
 			$this->handleGetValue($event);
+			return;
 		}
 
 		if ($event instanceof DeclarativeSettingsSetValueEvent) {
 			$this->handleSetValue($event);
+			return;
 		}
 
 	}
@@ -50,20 +53,29 @@ private function handleRegister(Event $event) {
 
 		$event->registerSchema(Application::APP_ID, [
 			'id' => 'mail-provider-support',
-			'priority' => 10,
+			'priority' => 11,
 			'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN,
 			'section_id' => 'server',
 			'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL,
 			'title' => $this->l->t('System Mails'),
-			'description' => $this->l->t('Allow to restrict filenames to ensure files can be synced with all clients. By default all filenames valid on POSIX (e.g. Linux or macOS) are allowed.'),
+			'description' => $this->l->t('System e-mails are messages generated automatically by Nextcloud. They are sent for example when a share is created or when inviting attendees to a calendar event..'),
 
 			'fields' => [
 				[
-					'id' => 'mail_providers_enabled',
-					'title' => $this->l->t('Allow system to use configured user mail accounts'),
-					'description' => $this->l->t('This will block filenames not valid on Windows systems, like using reserved names or special characters. But this will not enforce compatibility of case sensitivity.'),
-					'type' => DeclarativeSettingsTypes::CHECKBOX,
-					'default' => false,
+					'id' => 'mail_providers_disabled',
+					'title' => $this->l->t('Send system e-mails using'),
+					'type' => DeclarativeSettingsTypes::RADIO,
+					'default' => 0,
+					'options' => [
+						[
+							'name' => $this->l->t('People\'s configured mail account'),
+							'value' => 0
+						],
+						[
+							'name' => $this->l->t('System account'),
+							'value' => 1
+						],
+					],
 				],
 			],
 		]);
@@ -74,7 +86,7 @@ private function handleGetValue(Event $event) {
 
 		$event->setValue(
 			match($event->getFieldId()) {
-				'mail_providers_enabled' => $this->config->getValueBool('core', 'mail_providers_enabled', true),
+				'mail_providers_disabled' => $this->config->getSystemValueInt('mail_providers_disabled', 0),
 			}
 		);
 
@@ -83,8 +95,8 @@ private function handleGetValue(Event $event) {
 	private function handleSetValue(Event $event) {
 
 		switch ($event->getFieldId()) {
-			case 'mail_providers_enabled':
-				$this->config->setValueBool('core', 'mail_providers_enabled', (bool)$event->getValue());
+			case 'mail_providers_disabled':
+				$this->config->setSystemValue('mail_providers_disabled', $event->getValue());
 				$event->stopPropagation();
 				break;
 		}