Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

fix: report email as not sent to fe if it throws (#844)

Browse Source
This commit is contained in:
Fredrik Strand Oseberg 2021-05-11 12:15:20 +02:00 committed by GitHub
parent c9f67cc209
commit 52d3e9eb77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/routes/admin-api/user-admin.ts
View File

@ -33,12 +33,12 @@ export default class UserAdminController extends Controller {
resetTokenService, resetTokenService,
sessionService, sessionService,
}: Pick< }: Pick<
IUnleashServices, IUnleashServices,
| 'userService' | 'userService'
| 'accessService' | 'accessService'
| 'emailService' | 'emailService'
| 'resetTokenService' | 'resetTokenService'
| 'sessionService' | 'sessionService'
>, >,
) { ) {
super(config); super(config);
@ -137,13 +137,22 @@ export default class UserAdminController extends Controller {
user.email, user.email,
); );
let emailSent = false;
const emailConfigured = this.emailService.configured(); const emailConfigured = this.emailService.configured();
if (emailConfigured) { if (emailConfigured) {
await this.emailService.sendGettingStartedMail( try {
createdUser.name, await this.emailService.sendGettingStartedMail(
createdUser.email, createdUser.name,
inviteLink.toString(), createdUser.email,
); inviteLink.toString(),
);
emailSent = true;
} catch (e) {
this.logger.warn(
'email was configured, but sending failed due to: ',
e,
);
}
} else { } else {
this.logger.warn( this.logger.warn(
'email was not sent to the user because email configuration is lacking', 'email was not sent to the user because email configuration is lacking',
@ -153,7 +162,7 @@ export default class UserAdminController extends Controller {
res.status(201).send({ res.status(201).send({
...createdUser, ...createdUser,
inviteLink, inviteLink,
emailSent: emailConfigured, emailSent,
rootRole, rootRole,
}); });
} catch (e) { } catch (e) {