wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-12 13:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into better-graph

Browse Source
This commit is contained in:
Wyatt Johnson
2018-03-19 11:55:38 -06:00
committed by GitHub
parent 9d9adc8195 f346cf4caf
commit df64c98b48
28 changed files with 513 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-facebook-auth/server/passport.js
+8 -1
View File
@@ -25,7 +25,14 @@ module.exports = passport => {
async (req, accessToken, refreshToken, profile, done) => {
let user;
try {
user = await UsersService.findOrCreateExternalUser(profile);
const { id, provider, displayName } = profile;
user = await UsersService.findOrCreateExternalUser(
req.context,
id,
provider,
displayName
);
} catch (err) {
return done(err);
}
plugins/talk-plugin-google-auth/server/passport.js
+9 -2
View File
@@ -24,9 +24,16 @@ module.exports = passport => {
async (req, accessToken, refreshToken, profile, done) => {
let user;
try {
user = await UsersService.findOrCreateExternalUser(profile);
const { id, provider, displayName } = profile;
user = await UsersService.findOrCreateExternalUser(
req.context,
id,
provider,
displayName
);
} catch (err) {
return done(err.toString());
return done(err);
}
return ValidateUserLogin(profile, user, done);