Merge branch 'master' into asset-manager-tutorial

This commit is contained in:
Kim Gardner authored and GitHub committed 2018-03-15 21:00:23 -04:00
commit a84ad511e8
26 files changed
+197 -125

No files matched your search

+7 -1
View File
@@ -318,7 +318,13 @@ module.exports = {
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);
}