Merge branch 'develop' into upgrade-dependencies

raclim · web-flow · commit e40a305f8f32 · 2024-07-11T10:49:24.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.13.4",
+  "version": "2.13.5",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
diff --git a/server/config/passport.js b/server/config/passport.js
@@ -130,7 +130,7 @@ passport.use(
     },
     async (req, accessToken, refreshToken, profile, done) => {
       try {
-        const existingUser = await User.findOne({ github: profile.id });
+        const existingUser = await User.findOne({ github: profile.id }).exec();
 
         if (existingUser) {
           if (req.user && req.user.email !== existingUser.email) {
@@ -229,7 +229,7 @@ passport.use(
       try {
         const existingUser = await User.findOne({
           google: profile._json.emails[0].value
-        });
+        }).exec();
 
         if (existingUser) {
           if (req.user && req.user.email !== existingUser.email) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "p5.js-web-editor",`
`3`		`- "version": "2.13.4",`
	`3`	`+ "version": "2.13.5",`
`4`	`4`	`"description": "The web editor for p5.js.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "rimraf dist",`