Skip to content

Commit babab82

Browse files
committed
fix(settings): improve mail test error handling and logging
Signed-off-by: Abhinav Ohri <[email protected]>
1 parent bbca4fe commit babab82

File tree

7 files changed

+18
-6
lines changed

7 files changed

+18
-6
lines changed

apps/settings/css/settings.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/css/settings.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/css/settings.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,3 +789,12 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
789789
opacity: 1;
790790
}
791791
}
792+
793+
#sendtestmail_msg {
794+
&.error {
795+
display: inline-block;
796+
margin-top: 5px;
797+
border-radius: var(--border-radius);
798+
padding: 5px 10px;
799+
}
800+
}

apps/settings/lib/Controller/MailSettingsController.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use OCP\IURLGenerator;
2020
use OCP\IUserSession;
2121
use OCP\Mail\IMailer;
22+
use Psr\Log\LoggerInterface;
2223

2324
class MailSettingsController extends Controller {
2425

@@ -39,6 +40,7 @@ public function __construct(
3940
private IUserSession $userSession,
4041
private IURLGenerator $urlGenerator,
4142
private IMailer $mailer,
43+
private LoggerInterface $logger,
4244
) {
4345
parent::__construct($appName, $request);
4446
}
@@ -150,6 +152,7 @@ public function sendTestMail() {
150152
}
151153

152154
$this->config->setAppValue('core', 'emailTestSuccessful', '0');
155+
$this->logger->error('Failed sending test email: User ' . $this->userSession->getUser()->getUID() . ' has no email address configured in their account settings');
153156
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);
154157
}
155158
}

apps/settings/src/admin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ window.addEventListener('DOMContentLoaded', () => {
8989
.then(() => {
9090
OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
9191
}).catch((error) => {
92-
OC.msg.finishedError('#sendtestmail_msg', error)
92+
OC.msg.finishedError('#sendtestmail_msg', error.response.data)
9393
})
9494
})
9595
})

dist/settings-legacy-admin.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)