mirror of
https://github.com/arnaucube/commonroutesServer.git
synced 2026-02-28 05:26:42 +01:00
post with token runs now
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
module.exports = {
|
||||
|
||||
'secret': process.env.SECRET,
|
||||
'database': process.env.MONGO_DSN,
|
||||
/*'secret': process.env.SECRET,
|
||||
'database': process.env.MONGO_DSN,*/
|
||||
'secret': 'secretfortoken',
|
||||
'database': 'mongodb://localhost/comunalcar',
|
||||
"port" : process.env.PORT || 3000
|
||||
|
||||
};
|
||||
|
||||
@@ -47,9 +47,7 @@ exports.findAllTravelsFromUsername = function(req, res) {
|
||||
};
|
||||
|
||||
exports.addTravel = function(req, res) {
|
||||
console.log('POST new travel, content: ' + req.body.content);
|
||||
console.log(req.body);
|
||||
|
||||
console.log('POST new travel, title: ' + req.body.title);
|
||||
var travel = new travelModel({
|
||||
title: req.body.title,
|
||||
description: req.body.description,
|
||||
|
||||
@@ -15,6 +15,13 @@ exports.findAllUsers = function(req, res) {
|
||||
userModel.find(function(err, users) {
|
||||
if(err) res.send(500, err.message);
|
||||
|
||||
//password deletion
|
||||
for(var i=0; i<users.length; i++)
|
||||
{
|
||||
users[i].password="";
|
||||
console.log(users[i].password);
|
||||
}
|
||||
|
||||
console.log('GET /users');
|
||||
res.status(200).jsonp(users);
|
||||
});
|
||||
@@ -26,6 +33,9 @@ exports.findById = function(req, res) {
|
||||
if(err) return res.send(500, err.message);
|
||||
|
||||
console.log('GET /users/' + req.params.id);
|
||||
//password deletion
|
||||
|
||||
user.password="";
|
||||
res.status(200).jsonp(user);
|
||||
});
|
||||
};
|
||||
@@ -40,9 +50,10 @@ exports.findUserByUsername = function(req, res) {
|
||||
if (!user) {
|
||||
res.json({ success: false, message: 'no user found' });
|
||||
} else if (user) {
|
||||
console.log(user);
|
||||
// return the information including token as JSON
|
||||
//res.jsonp(user);
|
||||
user.password="";
|
||||
console.log(user);
|
||||
res.status(200).jsonp(user[0]);
|
||||
|
||||
|
||||
@@ -85,6 +96,7 @@ exports.updateUser = function(req, res) {
|
||||
|
||||
user.save(function(err) {
|
||||
if(err) return res.send(500, err.message);
|
||||
user.password="";
|
||||
res.status(200).jsonp(user);
|
||||
});
|
||||
});
|
||||
|
||||
14
package.json
14
package.json
@@ -4,14 +4,14 @@
|
||||
"description": "comunalCar, carsharing",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
"start": "node server.js"
|
||||
"start": "node server.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"mongoose": "^4.5.6",
|
||||
"express": "^4.7.1",
|
||||
"method-override": "^2.1.2",
|
||||
"body-parser": "^1.5.1",
|
||||
"jsonwebtoken" : "latest",
|
||||
"morgan" : "latest"
|
||||
"body-parser": "latest",
|
||||
"express": "^4.7.1",
|
||||
"jsonwebtoken": "latest",
|
||||
"method-override": "^2.1.2",
|
||||
"mongoose": "latest",
|
||||
"morgan": "latest"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ var morgan = require('morgan');
|
||||
var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
|
||||
var config = require('./config'); // get our config file
|
||||
|
||||
|
||||
mongoose.Promise = global.Promise;
|
||||
// Connection to DB
|
||||
mongoose.connect(config.database, function(err, res) {
|
||||
if(err) throw err;
|
||||
@@ -45,7 +45,7 @@ app.use(express.static(__dirname + '/web'));
|
||||
app.use(function(req, res, next) {
|
||||
res.header("Access-Control-Allow-Origin", "*");
|
||||
res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
|
||||
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
|
||||
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Access-Token");
|
||||
next();
|
||||
});
|
||||
|
||||
@@ -88,6 +88,7 @@ apiRoutes.use(function(req, res, next) {
|
||||
} else {
|
||||
// if everything is good, save to request for use in other routes
|
||||
req.decoded = decoded;
|
||||
//console.log("decoded " + decoded);
|
||||
next();
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user