ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit 5a7cf3442d646dd2f0d0cf4b9d07fa1129428ac0
parent f2b2fb06cc15c2350b2f950d23cb78d82d7e49f8
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Fri, 26 Feb 2016 19:32:48 +0300

Merge branches 'master' and 'master' of https://github.com/kriasoft/react-starter-kit

Diffstat:
Msrc/core/passport.js | 6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/passport.js b/src/core/passport.js @@ -24,7 +24,7 @@ import { auth as config } from '../config'; passport.use(new FacebookStrategy({ clientID: config.facebook.id, clientSecret: config.facebook.secret, - callbackURL: `/login/facebook/return`, + callbackURL: '/login/facebook/return', profileFields: ['name', 'email', 'link', 'locale', 'timezone'], passReqToCallback: true, }, (req, accessToken, refreshToken, profile, done) => { @@ -76,7 +76,7 @@ passport.use(new FacebookStrategy({ if (result.rowCount) { done(null, result.rows[0]); } else { - result = await query(`SELECT 1 FROM user_account WHERE email = $1`, profile._json.email); + result = await query('SELECT 1 FROM user_account WHERE email = $1', profile._json.email); if (result.rowCount) { // There is already an account using this email address. Sign in to // that account and link it with Facebook manually from Account Settings. @@ -100,7 +100,7 @@ passport.use(new FacebookStrategy({ userId, profile.displayName, profile._json.gender, `https://graph.facebook.com/${profile.id}/picture?type=large` ); - result = await query(`SELECT id, email FROM user_account WHERE id = $1;`, userId); + result = await query('SELECT id, email FROM user_account WHERE id = $1;', userId); done(null, result.rows[0]); } }