joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds ability to login with email when specifying it (#4276)

Browse Source 
* Adds ability to login with email when specifying it

* Adds tests for corner cases

* nits
This commit is contained in:
Florent Vilmart
2017-10-24 17:50:48 -04:00
committed by GitHub
parent 6685932b7f
commit 72888bc539
2 changed files with 179 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Routers/UsersRouter.js
View File

@@ -51,25 +51,33 @@ export class UsersRouter extends ClassesRouter {
handleLogIn(req) {
// Use query parameters instead if provided in url
if (!req.body.username && req.query.username) {
req.body = req.query;
let payload = req.body;
if (!payload.username && req.query.username || !payload.email && req.query.email) {
payload = req.query;
}
const {
username,
email,
password,
} = payload;
// TODO: use the right error codes / descriptions.
if (!req.body.username) {
throw new Parse.Error(Parse.Error.USERNAME_MISSING, 'username is required.');
if (!username && !email) {
throw new Parse.Error(Parse.Error.USERNAME_MISSING, 'username/email is required.');
}
if (!req.body.password) {
if (!password) {
throw new Parse.Error(Parse.Error.PASSWORD_MISSING, 'password is required.');
}
if (typeof req.body.username !== 'string' || typeof req.body.password !== 'string') {
if (typeof password !== 'string'
|| email && typeof email !== 'string'
|| username && typeof username !== 'string') {
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Invalid username/password.');
}
let user;
let isValidPassword = false;
return req.config.database.find('_User', { username: req.body.username })
const query = Object.assign({}, username ? { username } : {}, email ? { email } : {});
return req.config.database.find('_User', query)
.then((results) => {
if (!results.length) {
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Invalid username/password.');
@@ -79,7 +87,7 @@ export class UsersRouter extends ClassesRouter {
if (req.config.verifyUserEmails && req.config.preventLoginWithUnverifiedEmail && !user.emailVerified) {
throw new Parse.Error(Parse.Error.EMAIL_NOT_FOUND, 'User email is not verified.');
}
return passwordCrypto.compare(req.body.password, user.password);
return passwordCrypto.compare(password, user.password);
})
.then((correct) => {
isValidPassword = correct;