Skip to content

Commit 703c54a

Browse files
authored
Merge pull request #44 from reemodo/authenticateTokenBranch
authenticate Token
2 parents 536b9a2 + 275a182 commit 703c54a

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

server/routes/activitiesApi.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ const activityCollManager = require('../collections-manager/activityCollManager'
77

88
const consts = require('../../config')
99
const userCollManager = require('../collections-manager/userCollManager')
10+
const Utilities = require('../utility')
1011

1112

12-
router.get('/DBgenerator', async function(req, res){
13+
router.get('/DBgenerator',Utilities.authenticateToken, async function(req, res){
1314
try{
1415
await DBManager.reGenerate()
1516
res.end()
@@ -21,7 +22,7 @@ router.get('/DBgenerator', async function(req, res){
2122
})
2223

2324

24-
router.get('/myActivities/:userId', async function(req, res) {
25+
router.get('/myActivities/:userId',Utilities.authenticateToken, async function(req, res) {
2526
try {
2627
const userId = req.params.userId
2728
const activities = await activityCollManager.myActivity(userId)
@@ -32,7 +33,7 @@ router.get('/myActivities/:userId', async function(req, res) {
3233
}
3334
})
3435

35-
router.post('/:userId', async function(req, res){
36+
router.post('/:userId',Utilities.authenticateToken , async function(req, res){
3637
try{
3738
const userId = req.params.userId
3839
const userData = await userCollManager.getUserUniversityAndGender(userId)
@@ -49,7 +50,7 @@ router.post('/:userId', async function(req, res){
4950
}
5051
})
5152

52-
router.get('/transportations', async function(req, res){
53+
router.get('/transportations',Utilities.authenticateToken , async function(req, res){
5354
try{
5455
res.status(200).send(consts.transportations)
5556
}
@@ -58,7 +59,7 @@ router.get('/transportations', async function(req, res){
5859
}
5960
})
6061

61-
router.delete('/:activityId', async function(req, res){
62+
router.delete('/:activityId',Utilities.authenticateToken , async function(req, res){
6263
try{
6364
const activityId = req.params.activityId
6465
await activityCollManager.deleteActivity(activityId)
@@ -72,7 +73,7 @@ router.delete('/:activityId', async function(req, res){
7273

7374

7475

75-
router.patch('/:activityId', async function(req, res){
76+
router.patch('/:activityId',Utilities.authenticateToken , async function(req, res){
7677
try{
7778
const activityId = req.params.activityId
7879
const capacity = req.body.capacity
@@ -86,7 +87,7 @@ router.patch('/:activityId', async function(req, res){
8687
})
8788

8889

89-
router.get('/:userId', async function(req, res) {
90+
router.get('/:userId',Utilities.authenticateToken , async function(req, res) {
9091
try {
9192
const userId = req.params.userId
9293
const userData = await userCollManager.getUserUniversityAndGender(userId)
@@ -106,7 +107,7 @@ router.get('/:userId', async function(req, res) {
106107
}
107108
})
108109

109-
router.get('/university/:userID', async function(req, res){
110+
router.get('/university/:userID',Utilities.authenticateToken , async function(req, res){
110111
try{
111112
const userId = req.params.userID
112113
const userUniversity = await userCollManager.getUserUniversity(userId)
@@ -116,7 +117,7 @@ router.get('/university/:userID', async function(req, res){
116117
}
117118
})
118119

119-
router.get('/', async function(req, res) {
120+
router.get('/',Utilities.authenticateToken , async function(req, res) {
120121
try {
121122
const activities = await activityCollManager.getActivities()
122123
res.send(activities)

server/utility.js

+18-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,21 @@ const filterAllActivityField = function(userId,transportationType, specificGende
4545

4646
return filter
4747
}
48-
module.exports = {filterActivityField, filterAllActivityField}
48+
49+
const authenticateToken = function(req, res, next) {
50+
const authHeader = req.headers['authorization'];
51+
const token = authHeader && authHeader.split(' ')[1];
52+
if (!token) {
53+
return res.sendStatus(401);
54+
}
55+
56+
jwt.verify(token, secretKey, (err, user) => {
57+
if (err) {
58+
return res.sendStatus(401);
59+
}
60+
61+
req.user = user;
62+
next();
63+
});
64+
}
65+
module.exports = {filterActivityField, filterAllActivityField, authenticateToken}

0 commit comments

Comments
 (0)