complete mvp

api/auth/auth-middleware.js

@@ -16,6 +16,20 @@ const restricted = (req, res, next) => {
 
     Put the decoded token in the req object, to make life easier for middlewares downstream!
   */
+  const token = req.body.authorization
+
+  if(!token){
+    res.status(401).json("Token needed")
+  }else{
+    jwt.verify(token, jwtSecret, (err, decoded) => {
+      if(err){
+        res.status(401).json("Token is bad: " + err.message)
+      }else{
+        req.decodedToken = decoded
+        next()
+      }
+    })
+  }
 }
 
 const only = role_name => (req, res, next) => {
@@ -29,6 +43,12 @@ const only = role_name => (req, res, next) => {
 
     Pull the decoded token from the req object, to avoid verifying it again!
   */
+  let decodedToken = req.decodedToken
+  if(decodedToken.role_name != role_name) {
+    res.status(403).json({ message: 'This is not for you' })
+  }else{
+    next()
+  }
 }
 
 
@@ -40,6 +60,16 @@ const checkUsernameExists = (req, res, next) => {
       "message": "Invalid credentials"
     }
   */
+  User.findBy(req.body.username)
+    .then(response => {
+      if (!response) {
+        res.status(401).json({ message: 'Invalid credentials' })
+      }
+      else { next() }
+    })
+    .catch(err => {
+      res.status(500).json({ message: 'err.message' })
+    })
 }
 
 
@@ -62,6 +92,20 @@ const validateRoleName = (req, res, next) => {
       "message": "Role name can not be longer than 32 chars"
     }
   */
+  if (!req.body.role_name || req.body.role_name === "") {
+    req.body.role_name = 'student'
+    req.body.role_name.trim()
+    next()
+  }
+  else if (req.body.role_name === 'admin') {
+    res.status(422).json({ message: 'Role name can not be admin' })
+  }
+  else if (req.body.role_name.trim().length > 32) {
+    res.status(422).json({ mesage: 'Role name can not be longer than 32 chars' })
+  }
+  else {
+    next()
+  }
 }
 
 module.exports = {

api/auth/auth-router.js

@@ -1,6 +1,9 @@
 const router = require("express").Router();
 const { checkUsernameExists, validateRoleName } = require('./auth-middleware');
 const { JWT_SECRET } = require("../secrets"); // use this secret!
+const User = require('../users/users-model.js')
+const bcrypt = require('bcryptjs')
+const jwt = require("jsonwebtoken")
 
 router.post("/register", validateRoleName, (req, res, next) => {
   /**
@@ -14,8 +17,29 @@ router.post("/register", validateRoleName, (req, res, next) => {
       "role_name": "angel"
     }
    */
+  let user = req.body
+  const hash = bcrypt.hashSync(req.body.password, 8)
+  user.password = hash
+  User.add(user)
+    .then(newUser => {
+      res.status(201).json(newUser)
+    })
+    .catch(err => {
+      res.status(500).json({ message: err.message })
+    })
 });
 
+function makeToken(user){
+  const paylaod = {
+    subject: user.user_id,
+    username: user.username,
+    role_name: user.role_name
+  }
+  const options = {
+    expiresIn: "1d"
+  }
+  return jwt.sign(payload, jwtSecret, options)
+}
 
 router.post("/login", checkUsernameExists, (req, res, next) => {
   /**
@@ -37,6 +61,23 @@ router.post("/login", checkUsernameExists, (req, res, next) => {
       "role_name": "admin" // the role of the authenticated user
     }
    */
+  let { username, password } = req.body
+  User.findBy({ username})
+    .then(([user]) => {
+      if(user && bcrypt.compareSync(password, user.password)){
+        const makeToken = makeToken(user)
+
+        res.status(200).json({
+          message: `${user.username} is back!`,
+          token
+        })
+      }else{
+        res.status(401).json({ message: 'Invalid credentials' })
+      }
+    })
+    .catch(err => {
+      res.status(500).json({ message: err.message })
+    });
 });
 
 module.exports = router;

api/secrets/index.js

@@ -6,6 +6,8 @@
   If no fallback is provided, TESTS WON'T WORK and other
   developers cloning this repo won't be able to run the project as is.
  */
-module.exports = {
+const jwtSecret = process.env.JWT_SECRET || "shh";
 
+module.exports = {
+  jwtSecret
 }

api/users/users-model.js

@@ -18,6 +18,9 @@ function find() {
       }
     ]
    */
+ return db('users as u')
+    .join('roles as r', 'r.role_id', 'u.role_id')
+    .select('u.user_id', 'u.username', 'r.role_name')
 }
 
 function findBy(filter) {
@@ -34,6 +37,10 @@ function findBy(filter) {
       }
     ]
    */
+  return db('user as u')
+    .join('roles as r', 'r.role_id', 'u.role_id')
+    .select('u.*', 'r.role_name')
+    .where(filter)
 }
 
 function findById(user_id) {
@@ -47,6 +54,10 @@ function findById(user_id) {
       "role_name": "instructor"
     }
    */
+  return db('users as u')
+    .join('roles as r', 'r.role_id', 'u.role_id')
+    .select('u.user_id', 'u.username', 'r.role_name')
+    .where('u.user_id', user_id)
 }
 
 /**

index.js

@@ -1,6 +1,6 @@
 const server = require('./api/server.js');
 
-const PORT = process.env.PORT || 5000;
+const PORT = process.env.PORT || 6000;
 
 server.listen(PORT, () => {
   console.log(`Listening on port ${PORT}...`);