greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16133 from raisedadead/fix/keyword-in-email-support 

fix(auth): Add keyword in email support for passwordless
pull/16139/head
Berkeley Martinez 2017-11-29 15:30:38 -08:00 committed by GitHub
parent fe6177a084 af43360027
commit 8b9be0242a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/models/user.js
View File

@ -515,7 +515,7 @@ module.exports = function(User) {
.flatMap(token => {
const { id: loginToken } = token;
const loginEmail = user.email;
const loginEmail = new Buffer(user.email).toString('base64');
const host = getServerFullURL();
const mailOptions = {
type: 'email',

4
server/boot/user.js
View File

@ -269,7 +269,7 @@ module.exports = function(app) {
}
const authTokenId = req.query.token;
const authEmailId = req.query.email;
const authEmailId = new Buffer(req.query.email, 'base64').toString();
return AccessToken.findOne$({ where: {id: authTokenId} })
.map(authToken => {
@ -319,7 +319,7 @@ module.exports = function(app) {
return res.redirect('/email-signin');
}
const email = req.query.email;
const email = new Buffer(req.query.email, 'base64').toString();
return User.findOne$({ where: { email }})
.map(user => {