From 870d9ceded97940f2742a1dd5ba59472731c49bc Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Wed, 1 May 2019 15:38:11 -0400
Subject: [PATCH] Fixes #760 (#1046)

* fixes #760

* fixes linting errors
---
 server/config/passport.js | 59 ++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/server/config/passport.js b/server/config/passport.js
index 90ca8510..17975c02 100644
--- a/server/config/passport.js
+++ b/server/config/passport.js
@@ -1,3 +1,5 @@
+import slugify from 'slugify';
+import friendlyWords from 'friendly-words';
 import User from '../models/user';
 
 const lodash = require('lodash');
@@ -110,7 +112,7 @@ passport.use(new GoogleStrategy({
   clientSecret: process.env.GOOGLE_SECRET,
   callbackURL: '/auth/google/callback',
   passReqToCallback: true,
-  scope: ['email'],
+  scope: ['openid email'],
 }, (req, accessToken, refreshToken, profile, done) => {
   User.findOne({ google: profile._json.emails[0].value }, (findByGoogleErr, existingUser) => {
     if (existingUser) {
@@ -123,24 +125,43 @@ passport.use(new GoogleStrategy({
     User.findOne({
       email: primaryEmail,
     }, (findByEmailErr, existingEmailUser) => {
-      if (existingEmailUser) {
-        existingEmailUser.email = existingEmailUser.email || primaryEmail;
-        existingEmailUser.google = profile._json.emails[0].value;
-        existingEmailUser.username = existingEmailUser.username || profile._json.emails[0].value;
-        existingEmailUser.tokens.push({ kind: 'google', accessToken });
-        existingEmailUser.name = existingEmailUser.name || profile._json.displayName;
-        existingEmailUser.verified = User.EmailConfirmation.Verified;
-        existingEmailUser.save(saveErr => done(null, existingEmailUser));
-      } else {
-        const user = new User();
-        user.email = primaryEmail;
-        user.google = profile._json.emails[0].value;
-        user.username = profile._json.emails[0].value;
-        user.tokens.push({ kind: 'google', accessToken });
-        user.name = profile._json.displayName;
-        user.verified = User.EmailConfirmation.Verified;
-        user.save(saveErr => done(null, user));
-      }
+      let username = profile._json.emails[0].value.split('@')[0];
+      User.findOne({ username }, (findByUsernameErr, existingUsernameUser) => {
+        if (existingUsernameUser) {
+          const adj = friendlyWords.predicates[Math.floor(Math.random() * friendlyWords.predicates.length)];
+          username = slugify(`${username} ${adj}`);
+        }
+        // what if a username is already taken from the display name too?
+        // then, append a random friendly word?
+        if (existingEmailUser) {
+          existingEmailUser.email = existingEmailUser.email || primaryEmail;
+          existingEmailUser.google = profile._json.emails[0].value;
+          existingEmailUser.username = existingEmailUser.username || username;
+          existingEmailUser.tokens.push({ kind: 'google', accessToken });
+          existingEmailUser.name = existingEmailUser.name || profile._json.displayName;
+          existingEmailUser.verified = User.EmailConfirmation.Verified;
+          existingEmailUser.save((saveErr) => {
+            if (saveErr) {
+              console.log(saveErr);
+            }
+            done(null, existingEmailUser);
+          });
+        } else {
+          const user = new User();
+          user.email = primaryEmail;
+          user.google = profile._json.emails[0].value;
+          user.username = username;
+          user.tokens.push({ kind: 'google', accessToken });
+          user.name = profile._json.displayName;
+          user.verified = User.EmailConfirmation.Verified;
+          user.save((saveErr) => {
+            if (saveErr) {
+              console.log(saveErr);
+            }
+            done(null, user);
+          });
+        }
+      });
     });
   });
 }));