Merge pull request #4244 from withspectrum/fix-cookie-setting-with-em…

…ail-changes

Update the user cookie when confirming an email

api/queries/user/rootCurrentUser.js

@@ -1,5 +1,10 @@
 // @flow
 import type { GraphQLContext } from '../../';
+import { getUserById } from 'shared/db/queries/user';
 
-export default (_: any, __: any, { user }: GraphQLContext) =>
-  user ? (user.bannedAt ? null : user) : null;
+export default async (_: any, __: any, { user }: GraphQLContext) => {
+  if (!user || !user.id) return null;
+  const dbUser = await getUserById(user.id);
+  if (!dbUser || dbUser.bannedAt) return null;
+  return dbUser;
+};

api/routes/api/email.js

@@ -190,8 +190,19 @@ emailRouter.get('/validate', (req, res) => {
       const rootRedirect = IS_PROD
         ? `https://spectrum.chat`
         : `http://localhost:3000`;
-      if (!user.username) return res.redirect(rootRedirect);
-      return res.redirect(`${rootRedirect}/users/${user.username}/settings`);
+
+      req.login(user, err => {
+        if (err) {
+          return res
+            .status(400)
+            .send(
+              'We ran into an issue validating this email address. You can re-enter your email address in your community settings to resend a confirmation email, or get in touch with us at [email protected].'
+            );
+        }
+
+        if (!user.username) return res.redirect(rootRedirect);
+        return res.redirect(`${rootRedirect}/users/${user.username}/settings`);
+      });
     });
   } catch (err) {
     console.error(err);