krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to mongoose 7 (#14971)

Browse Source 
* remove some unused dependencies

* update mongoose version

* make common tests pass

* Make unit tests pass

* make api v3 integration tests pass

* fix lint issues

* fix issue with package-lock

* fix(lint): we don't need no .js

* fix(lint): update to latest config-habitrpg

* chore(npm): update package locks

* fix(test): replace deprecated fn

* chore(package): update eslint-habitrpg again

* fix(lint): server linting

* fix(lint): client linting

* fix(client): correct mangled common imports

* chore(npm): update package-locks

* fix(lint): punctuation, module

---------

Co-authored-by: SabreCat <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
This commit is contained in:
Phillip Thelen
2024-01-16 22:18:47 +01:00
committed by GitHub
parent d0e4b533e3
commit f8d315ff6e
189 changed files with 2645 additions and 1423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
website/server/controllers/api-v3/auth.js
View File

@@ -351,15 +351,17 @@ api.resetPassword = {
{ 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();
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);
}
@@ -512,7 +514,7 @@ api.deleteSocial = {
const unset = {
[`auth.${network}`]: 1,
};
await User.update({ _id: user._id }, { $unset: unset }).exec();
await User.updateOne({ _id: user._id }, { $unset: unset }).exec();
res.respond(200, {});
},