sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(apple auth): minor fixes, make sure apple auth users are considered when sending emails

Browse source
This commit is contained in:
Matteo Pagliazzi 2020-04-16 23:23:08 +02:00
parent 2b7fe7c1d5
commit 86d2fed76e
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
website/server/controllers/api-v3/quests.js
View file

@ -80,7 +80,7 @@ api.inviteToQuest = {
'party._id': group._id,
_id: { $ne: user._id },
})
.select('auth.facebook auth.google auth.local preferences.emailNotifications preferences.pushNotifications preferences.language profile.name pushDevices webhooks')
.select('auth preferences.emailNotifications preferences.pushNotifications preferences.language profile.name pushDevices webhooks')
.exec();
group.markModified('quest');

6
website/server/controllers/api-v3/user.js
View file

@ -280,7 +280,10 @@ api.deleteUser = {
if (user.auth.local.hashed_password && user.auth.local.email) {
const isValidPassword = await passwordUtils.compare(user, password);
if (!isValidPassword) throw new NotAuthorized(res.t('wrongPassword'));
} else if ((user.auth.facebook.id || user.auth.google.id) && password !== DELETE_CONFIRMATION) {
} else if (
(user.auth.facebook.id || user.auth.google.id || user.auth.apple.id)
&& password !== DELETE_CONFIRMATION
) {
throw new NotAuthorized(res.t('incorrectDeletePhrase', { magicWord: 'DELETE' }));
}
@ -366,6 +369,7 @@ api.getUserAnonymized = {
delete user.auth.local;
delete user.auth.facebook;
delete user.auth.google;
delete user.auth.apple;
}
delete user.newMessages;
delete user.profile;

1
website/server/libs/invites/index.js
View file

@ -155,6 +155,7 @@ async function inviteByEmail (invite, group, inviter, req, res) {
{ 'auth.local.email': invite.email },
{ 'auth.facebook.emails.value': invite.email },
{ 'auth.google.emails.value': invite.email },
{ 'auth.apple.emails.value': invite.email },
],
})
.select({ _id: true, 'preferences.emailNotifications': true })