Merge branch 'develop' into chore/ban-users

Author: catarak

server/config/passport.js

@@ -117,7 +117,8 @@ passport.use(
       clientSecret: process.env.GITHUB_SECRET,
       callbackURL: '/auth/github/callback',
       passReqToCallback: true,
-      scope: ['user:email']
+      scope: ['user:email'],
+      allRawEmails: true
     },
     (req, accessToken, refreshToken, profile, done) => {
       User.findOne({ github: profile.id }, (findByGithubErr, existingUser) => {
@@ -149,8 +150,18 @@ passport.use(
           }
           req.user.save((saveErr) => done(null, req.user));
         } else {
-          User.findByEmail(emails, (findByEmailErr, existingEmailUser) => {
-            if (existingEmailUser) {
+          User.findAllByEmails(emails, (findByEmailErr, existingEmailUsers) => {
+            if (existingEmailUsers.length) {
+              let existingEmailUser;
+              // Handle case where user has made multiple p5.js Editor accounts,
+              // with emails that are connected to the same GitHub account
+              if (existingEmailUsers.length > 1) {
+                existingEmailUser = existingEmailUsers.find(
+                  (u) => (u.email = primaryEmail)
+                );
+              } else {
+                [existingEmailUser] = existingEmailUsers;
+              }
               existingEmailUser.email = existingEmailUser.email || primaryEmail;
               existingEmailUser.github = profile.id;
               existingEmailUser.username =

server/models/user.js

@@ -208,6 +208,23 @@ userSchema.statics.findByEmail = function findByEmail(email, cb) {
   return this.findOne(query).collation({ locale: 'en', strength: 2 }).exec(cb);
 };
 
+/**
+ *
+ * Queries User collection by emails and returns all Users that match.
+ *
+ * @param {string[]} emails - Array of email strings
+ * @callback [cb] - Optional error-first callback that passes User document
+ * @return {Promise<Object>} - Returns Promise fulfilled by User document
+ */
+userSchema.statics.findAllByEmails = function findAllByEmails(emails, cb) {
+  const query = {
+    email: { $in: emails }
+  };
+  // Email addresses should be case-insensitive unique
+  // In MongoDB, you must use collation in order to do a case-insensitive query
+  return this.find(query).collation({ locale: 'en', strength: 2 }).exec(cb);
+};
+
 /**
  *
  * Queries User collection by username and returns one User document.