Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions routes/api/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const express = require('express')
const router = express.Router()
const jwt = require('jsonwebtoken')
const bcrypt = require('bcryptjs')
const authentication = require('../../middleware/authentication')
const auth = require('../../middleware/authentication')
const User = require('../../models/User')
const {check, validationResult} = require('express-validator')
const config = require('config')
Expand All @@ -13,7 +13,7 @@ const config = require('config')
// @access Public

// return user's data if token is valid
router.get('/', authentication, async (req, res) => {
router.get('/', auth, async (req, res) => {
try {
const user = await User.findById(req.user.id).select('-password')
return res.json(user)
Expand Down
12 changes: 7 additions & 5 deletions routes/api/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const router =express.Router();
const request = require('request');
const config = require('config')
const auth = require('../../middleware/authentication');
const {check, validatorResult, validationResult} = require('express-validator');
const {check, validationResult} = require('express-validator');


const Profile = require('../../models/Profile');
Expand All @@ -15,14 +15,15 @@ const User = require('../../models/User')
// @access Private : ( we need an authentication for this route i.e sending in a token)
router.get('/me', auth, async (req, res) => {
try {
// getting info with the populate method

const profile = await Profile.findOne({})
// getting info with the populate method
const profile = await Profile.findOne({user:req.user.id}).populate('user', ['name', 'avatar' ])
// check if no profile
console.log(auth.token)
if(!profile) {
return res.status(400).json({msg:'There is no profile for this user'});
};
res.json(profile)
console.log(profile)
} catch (error) {
console.error(error.message)
res.status(500).json({msg:'Server Error'})
Expand Down Expand Up @@ -246,7 +247,7 @@ try {
}
});

module.exports = router;




Expand Down Expand Up @@ -277,3 +278,4 @@ router.get('/github/:username', (req, res) => {
}
})

module.exports = router;