Redirect to /account when linking fails

Author: catarak

server/server.js

@@ -136,18 +136,45 @@ app.use(assetRoutes);
 
 app.use('/', embedRoutes);
 app.get('/auth/github', passport.authenticate('github'));
-app.get('/auth/github/callback', passport.authenticate('github', { failureRedirect: '/login' }), (req, res) => {
-  res.redirect('/');
+app.get('/auth/github/callback', (req, res, next) => {
+  passport.authenticate('github', { failureRedirect: '/login' }, (err, user) => {
+    if (err) {
+      // use query string param to show error;
+      res.redirect('/account');
+      return;
+    }
+
+    req.logIn(user, (loginErr) => {
+      if (loginErr) {
+        next(loginErr);
+        return;
+      }
+      res.redirect('/');
+    });
+  })(req, res, next);
 });
 
 app.get('/auth/google', passport.authenticate('google'));
-app.get('/auth/google/callback', passport.authenticate('google', { failureRedirect: '/login' }), (req, res) => {
-  res.redirect('/');
+app.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');
+      return;
+    }
+
+    req.logIn(user, (loginErr) => {
+      if (loginErr) {
+        next(loginErr);
+        return;
+      }
+      res.redirect('/');
+    });
+  })(req, res, next);
 });
 
 // configure passport
 require('./config/passport');
-// const passportConfig = require('./config/passport');
 
 // Connect to MongoDB
 mongoose.Promise = global.Promise;
@@ -190,7 +217,7 @@ app.get('*', (req, res) => {
 // start app
 app.listen(process.env.PORT, (error) => {
   if (!error) {
-    console.log(`p5js web editor is running on port: ${process.env.PORT}!`); // eslint-disable-line
+    console.log(`p5.js Web Editor is running on port: ${process.env.PORT}!`); // eslint-disable-line
   }
 });