Merge pull request #56862 from abhinavohri/56609

Author: provokateurin

apps/settings/css/settings.css

@@ -789,3 +789,12 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
     opacity: 1;
   }
 }
+
+#sendtestmail_msg {
+	&.error {
+		display: inline-block;
+		margin-top: 5px;
+		border-radius: var(--border-radius);
+		padding: 5px 10px;
+	}
+}

apps/settings/css/settings.css.map

@@ -19,6 +19,7 @@
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Mail\IMailer;
+use Psr\Log\LoggerInterface;
 
 class MailSettingsController extends Controller {
 
@@ -39,6 +40,7 @@ public function __construct(
 		private IUserSession $userSession,
 		private IURLGenerator $urlGenerator,
 		private IMailer $mailer,
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -145,11 +147,13 @@ public function sendTestMail() {
 				return new DataResponse();
 			} catch (\Exception $e) {
 				$this->config->setAppValue('core', 'emailTestSuccessful', '0');
+				$this->logger->error('Failed sending test email: ' . $e->getMessage(), ['exception' => $e]);
 				return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
 			}
 		}
 
 		$this->config->setAppValue('core', 'emailTestSuccessful', '0');
+		$this->logger->error('Failed sending test email: User ' . $this->userSession->getUser()->getUID() . ' has no email address configured in their account settings');
 		return new DataResponse($this->l10n->t('You need to set your account email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST);
 	}
 }

apps/settings/css/settings.scss

@@ -89,7 +89,7 @@ window.addEventListener('DOMContentLoaded', () => {
 			.then(() => {
 				OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
 			}).catch((error) => {
-				OC.msg.finishedError('#sendtestmail_msg', error)
+				OC.msg.finishedError('#sendtestmail_msg', error.response.data)
 			})
 	})
 })

apps/settings/lib/Controller/MailSettingsController.php

@@ -19,6 +19,7 @@
 use OCP\Mail\IEMailTemplate;
 use OCP\Mail\IMailer;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 /**
  * @package Tests\Settings\Controller
@@ -29,6 +30,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
 	private IMailer&MockObject $mailer;
 	private IL10N&MockObject $l;
 	private IURLGenerator&MockObject $urlGenerator;
+	private LoggerInterface&MockObject $logger;
 	private MailSettingsController $mailController;
 
 	protected function setUp(): void {
@@ -39,6 +41,7 @@ protected function setUp(): void {
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->mailer = $this->createMock(IMailer::class);
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 		/** @var IRequest&MockObject $request */
 		$request = $this->createMock(IRequest::class);
 		$this->mailController = new MailSettingsController(
@@ -49,6 +52,7 @@ protected function setUp(): void {
 			$this->userSession,
 			$this->urlGenerator,
 			$this->mailer,
+			$this->logger,
 		);
 	}