sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 21:57:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(auth): take best guess when multiple accts with same email (#13980)

Browse source 
Co-authored-by: SabreCat <sabe@habitica.com>
This commit is contained in:
Sabe Jones 2022-05-19 15:32:03 -05:00 committed by GitHub
parent 1f2c926a54
commit 31385b3e7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
website/server/controllers/api-v3/auth.js
View file

@ -1,5 +1,6 @@
import validator from 'validator';
import moment from 'moment';
import sortBy from 'lodash/sortBy';
import nconf from 'nconf';
import {
authWithHeaders,
@ -341,15 +342,23 @@ api.resetPassword = {
if (validationErrors) throw validationErrors;
const email = req.body.email.toLowerCase();
const user = await User.findOne({
$or: [
{ 'auth.local.username': email.replace(/^@/, '') },
{ 'auth.local.email': email },
{ 'auth.apple.emails.value': email },
{ 'auth.google.emails.value': email },
{ 'auth.facebook.emails.value': email },
],
}).exec();
let user = await User.findOne(
{ 'auth.local.email': email }, // Prefer to reset password for local auth
{ auth: 1 },
).exec();
if (!user) { // If no local auth with that email...
const potentialUsers = await User.find({
$or: [
{ 'auth.local.username': email.replace(/^@/, '') },
{ 'auth.apple.emails.value': email },
{ 'auth.google.emails.value': email },
{ 'auth.facebook.emails.value': email },
],
},
{ auth: 1 }).exec();
// ...prefer oldest social account or username with matching email
[user] = sortBy(potentialUsers, candidate => candidate.auth.timestamps.created);
}
if (user) {
// create an encrypted link to be used to reset the password