update auth to use middleware

Author: Sambillingham

modules/util.js

@@ -6,3 +6,10 @@ module.exports.urlString = () => {
     }
     return string;
 }
+
+module.exports.isAuthenticated = (req, res, next) => {
+  if (req.session.steemconnect)
+      return next();
+
+  res.redirect('/');
+}

public/js/main.js

@@ -50,8 +50,13 @@ if ($('main').hasClass('feed') ) {
         dataType: 'json',
         data:  $(e.currentTarget).parent().serialize()
       }, (response) => {
-        $(`*[data-post-id="${response.id}"]`).children().last().after()
+        if (response.error) {
+          $(`*[data-post-id="${response.id}"]`).children().last().after()
+          .append(`<span>${response.error.error_description}</span>`)
+        } else {
+          $(`*[data-post-id="${response.id}"]`).children().last().after()
           .append('<span>  Voted!</span>')
+        }
       })
 
     })

routes/feed.js

@@ -1,13 +1,10 @@
 let express = require('express');
+let util = require('../modules/util');
 let router = express.Router();
 
 /* GET users listing. */
-router.get('/', (req, res, next) => {
-    if (!req.session.steemconnect) {
-      res.redirect('/auth')
-    } else {
-        res.render('feed', {});
-    }
+router.get('/', util.isAuthenticated, (req, res, next) => {
+    res.render('feed', {});
 });
 
 module.exports = router;

routes/post.js

@@ -3,26 +3,14 @@ let util = require('../modules/util');
 let steem = require('../modules/steemconnect')
 let router = express.Router();
 
-/* GET users listing. */
-router.get('/', (req, res, next) => {
-    if (!req.session.steemconnect) {
-      res.redirect('/auth')
-    } else {
-      console.log(req.session.steemconnect)
-        res.render('post', {
-          name: req.session.steemconnect.name
-        });
-    }
-});
 
-router.post('/create-post', (req, res) => {
-  if (!req.session.steemconnect) {
-    res.redirect('/auth')
-  } else {
-    console.log(req.body)
-    api.vote(voter, author, permlink, weight, function (err, res) {
-      console.log(err, res)
+router.get('/', util.isAuthenticated, (req, res, next) => {
+    res.render('post', {
+      name: req.session.steemconnect.name
     });
+});
+
+router.post('/create-post', util.isAuthenticated, (req, res) => {
     let author = req.session.steemconnect.name
     let permlink = util.urlString()
     var tags = req.body.tags.split(',').map(item => item.trim());
@@ -45,36 +33,22 @@ router.post('/create-post', (req, res) => {
           msg: msg
         })
     });
-
-  }
 });
 
-router.post('/vote', (req, res) => {
-  if (!req.session.steemconnect) {
-    res.redirect('/auth')
-  } else {
-      let postId = req.body.postId
-      let voter = req.session.steemconnect.name
-      let author = req.body.author
-      let permlink = req.body.permlink
-      let weight = 10000
-
-      steem.vote(voter, author, permlink, weight, function (err, steemResponse) {
-        if (err) {
-              res.json({
-                error: error.error_description
-              })
-        } else {
-          res.json({
-            name: req.session.steemconnect.name,
-            msg: 'voted!',
-            id: postId
-          })
-        }
-
-      });
-
-  }
+router.post('/vote', util.isAuthenticated, (req, res) => {
+    let postId = req.body.postId
+    let voter = req.session.steemconnect.name
+    let author = req.body.author
+    let permlink = req.body.permlink
+    let weight = 10000
+
+    steem.vote(voter, author, permlink, weight, function (err, steemResponse) {
+      if (err) {
+          res.json({ error: err.error_description })
+      } else {
+          res.json({ id: postId })
+      }
+    });
 })
 
 module.exports = router;

routes/user.js

@@ -1,26 +1,20 @@
 let express = require('express');
+let util = require('../modules/util');
 let router = express.Router();
 
 /* GET users listing. */
-router.get('/', (req, res, next) => {
-    if (!req.session.steemconnect) {
-      res.redirect('/auth')
-    } else {
+router.get('/', util.isAuthenticated, (req, res, next) => {
       let userMetadata = {};
       if (req.session.steemconnect.json_metadata == '' || req.session.steemconnect.json_metadata === undefined) {
         userMetadata.profile = { about: ''}
-        console.log(userMetadata)
       } else {
         userMetadata = JSON.parse(req.session.steemconnect.json_metadata)
-        console.log(userMetadata)
       }
-
       res.render('user', {
         name: req.session.steemconnect.name,
         about: userMetadata.profile.about,
         profileImage: userMetadata.profile.profile_image
       });
-    }
 });
 
 module.exports = router;