Skip to content

Commit

Permalink
added /users/self route and returning readable date from created posts
Browse files Browse the repository at this point in the history
  • Loading branch information
swarajpure committed Dec 17, 2020
1 parent 73229a3 commit 17125ae
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
6 changes: 5 additions & 1 deletion controllers/posts.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ const createPost = async (req, res) => {
return res.status(400).send(error.details[0].message);
}
try {
const d = Date.now()
const date = new Date(d)
const dateString = date.toDateString()
console.log(dateString)
const post = {
author: req.body.author,
content: req.body.content,
date: Date.now()
date: dateString
}
await postQuery.addPost(post);
console.log(post);
Expand Down
7 changes: 6 additions & 1 deletion controllers/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ const getUsers = async (req, res) => {
}
}

const getSelfDetails = (req, res) => {
res.send(req.userData)
}

const login = async (req,res) => {
try {
const { error } = validation.loginValidation(req.body);
Expand All @@ -27,7 +31,7 @@ const login = async (req,res) => {
return res.status(400).send("Wrong Password");
}

const token = jwt.sign({ id: userDetails.id, role: userDetails.role}, process.env.TOKEN_SECRET);
const token = jwt.sign({ id: userDetails.id, role: userDetails.role, name: userDetails.name}, process.env.TOKEN_SECRET);
return res.cookie('session', token, {
domain: 'localhost',
expires: new Date(Date.now() + 9999999999)
Expand Down Expand Up @@ -78,6 +82,7 @@ const register = async (req, res) => {

module.exports = {
getUsers,
getSelfDetails,
login,
register
}
2 changes: 2 additions & 0 deletions middlewares/authenticate.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ const isUser = (req, res, next) => {
if(!token) {
return res.status(401).send("You need to be logged in to view this page!");
}
const decoded = jwt.verify(token, process.env.TOKEN_SECRET);
req.userData = decoded //adding name and role to the req object
return next()
}

Expand Down
2 changes: 1 addition & 1 deletion routes/posts.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ const router = express.Router();
const authenticate = require('../middlewares/authenticate');
const postsController = require('../controllers/posts')

// router.get('/', authenticate.isUser, postsController.getPosts);
router.get('/', authenticate.isUser, postsController.getPosts);

router.post('/create', authenticate.isTeacher, postsController.createPost);

module.exports = router;
2 changes: 2 additions & 0 deletions routes/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ const userController = require('../controllers/users')

router.get('/', authenticate.isUser, userController.getUsers)

router.get('/self', authenticate.isUser, userController.getSelfDetails)

router.post('/login', userController.login)

router.post('/register', userController.register)
Expand Down

0 comments on commit 17125ae

Please sign in to comment.