Merge master

2026-08-02 13:10:23 +08:00 · 2018-04-10 20:10:21 -04:00
parent ac9899406a 46078117c8
commit 3915ffc4e0
537 changed files with 14237 additions and 4489 deletions
@@ -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);