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: emailservice now just returns if email was configured

Browse Source
This commit is contained in:
Christopher Kolstad 2021-04-23 15:24:32 +02:00
parent 7cb7e4a193
commit 97d77d84cc
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/db/feature-toggle-store.js
View File

@ -99,15 +99,18 @@ class FeatureToggleStore {
}
async getProjectId(name) {
return this.db
.first(['project'])
.from(TABLE)
.where({ name })
.then(r => (r ? r.project : undefined))
.catch(e => {
this.logger.error(e);
return undefined;
});
if (name) {
return this.db
.first(['project'])
.from(TABLE)
.where({ name })
.then(r => (r ? r.project : undefined))
.catch(e => {
this.logger.error(e);
return undefined;
});
}
return undefined;
}
async hasFeature(name) {

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

@ -108,9 +108,8 @@ export default class UserAdminController extends Controller {
);
const emailConfigured = this.emailService.configured();
let sentMetaData = null;
if (emailConfigured) {
sentMetaData = await this.emailService.sendGettingStartedMail(
await this.emailService.sendGettingStartedMail(
createdUser.name,
createdUser.email,
inviteLink.toString(),
@ -121,13 +120,10 @@ export default class UserAdminController extends Controller {
);
}
const emailSent =
sentMetaData?.response.includes(MAIL_ACCEPTED) || false;
res.status(201).send({
...createdUser,
inviteLink,
emailSent,
emailSent: emailConfigured,
rootRole,
});
} catch (e) {