arnaucube
arnaucube/commonroutesServerPublic Self-hosted repository
routes
arnaucode idoctnef@openmailbox.org
Thu, 26 Jan 2017 14:12:41 +0100
commit

f0c9c373d00ae31546f4152c9e01f22093ac8d9e

parent

453225ad33facf55dcd0ce364f47568608b20e3d

4 files changed, 6 insertions(+), 5 deletions(-)

jump to
M controllers/travelController.js → controllers/travelController.js

@@ -53,7 +53,7 @@ generateddate: Date(),

seats: req.body.seats, package: req.body.package, collectivized: req.body.collectivized, - type: req.body.modality + type: req.body.type }); travel.save(function(err, travel) {
M controllers/userController.js → controllers/userController.js

@@ -111,7 +111,7 @@ //GET - Return a User with specified ID

exports.getUserById = function (req, res) { userModel.findOne({_id: req.params.userid}) .lean() - .populate('travels', 'title from to date') + .populate('travels', 'title from to date type') .exec(function (err, user) { if (err) return res.send(500, err.message); if (!user) {
M models/userModel.js → models/userModel.js

@@ -9,7 +9,7 @@ username: { type: String, required: true, unique: true },

password: { type: String, required: true, selected: false }, token: { type: String, selected: false }, description: { type: String, default: "Hello world" }, - avatar: { type: String, default: "racoon" }, + avatar: { type: String, default: "img/avatars/racoon.png" }, email: { type: String, required: true }, phone: { type: String }, telegram: { type: String },
M server.js → server.js

@@ -81,7 +81,8 @@ if (token) {

// verifies secret and checks exp jwt.verify(token, app.get('superSecret'), function(err, decoded) { if (err) { - return res.json({ + return res.send(204, + { success: false, message: 'Failed to authenticate token.' });

@@ -97,7 +98,7 @@ } else {

// if there is no token // return an error - return res.status(201).send({ + return res.status(204).send({ success: false, message: 'No token provided.' });