refactor passport routes with clearer errors for no user

Author: raclim

server/routes/passport.routes.js

@@ -3,38 +3,19 @@ import passport from 'passport';
 
 const router = new Router();
 
-router.get('/auth/github', passport.authenticate('github'));
-router.get('/auth/github/callback', (req, res, next) => {
+const authenticateOAuth = (service) => (req, res, next) => {
   passport.authenticate(
-    'github',
+    service,
     { failureRedirect: '/login' },
-    (err, user) => {
+    (err, user, info) => {
       if (err) {
         // use query string param to show error;
-        res.redirect('/account?error=github');
+        res.redirect(`/account?error=${service}`);
         return;
       }
 
-      req.logIn(user, (loginErr) => {
-        if (loginErr) {
-          next(loginErr);
-          return;
-        }
-        res.redirect('/');
-      });
-    }
-  )(req, res, next);
-});
-
-router.get('/auth/google', passport.authenticate('google'));
-router.get('/auth/google/callback', (req, res, next) => {
-  passport.authenticate(
-    'google',
-    { failureRedirect: '/login' },
-    (err, user) => {
-      if (err) {
-        // use query string param to show error;
-        res.redirect('/account?error=google');
+      if (!user) {
+        res.redirect(`/account?error=${service}NoUser`);
         return;
       }
 
@@ -47,6 +28,12 @@ router.get('/auth/google/callback', (req, res, next) => {
       });
     }
   )(req, res, next);
-});
+};
+
+router.get('/auth/github', passport.authenticate('github'));
+router.get('/auth/github/callback', authenticateOAuth('github'));
+
+router.get('/auth/google', passport.authenticate('google'));
+router.get('/auth/google/callback', authenticateOAuth('google'));
 
 export default router;