arnaucube/commonroutesServer
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesServer.git synced 2026-02-28 05:26:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

all posts runing by token

Browse Source
This commit is contained in:
arnaucode
2016-10-16 23:25:39 +02:00
parent cfa84bfa6d
commit 840d7de000
3 changed files with 167 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
controllers/travelController.js
View File

@@ -52,55 +52,59 @@ exports.findAllTravelsFromUsername = function(req, res) {
exports.addTravel = function(req, res) { exports.addTravel = function(req, res) {
console.log('POST new travel, title: ' + req.body.title); console.log('POST new travel, title: ' + req.body.title);
var travel = new travelModel({ userModel.find({
title: req.body.title, token: req.headers['x-access-token']
description: req.body.description, }, function(err, users){
owner: req.body.owner, var user=users[0];
from: req.body.from,
to: req.body.to,
date: req.body.date,
periodic: req.body.periodic,
generateddate: req.body.generateddate,
seats: req.body.seats,
package: req.body.package,
icon: req.body.icon,
phone: req.body.phone,
telegram: req.body.telegram,
collectivized: req.body.collectivized,
modality: req.body.modality
});
if(travel.title==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.description==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.from==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.to==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.date==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.seats==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.title==undefined)
{
return res.status(500).jsonp("empty inputs");
}
travel.save(function(err, travel) { var travel = new travelModel({
if(err) return res.send(500, err.message); title: req.body.title,
//res.status(200).jsonp(travel); description: req.body.description,
travelModel.find({date: {$gte: new Date()}}, function(err, travels) { owner: user.username,
if(err) res.send(500, err.message); from: req.body.from,
to: req.body.to,
res.status(200).jsonp(travels); date: req.body.date,
periodic: req.body.periodic,
generateddate: req.body.generateddate,
seats: req.body.seats,
package: req.body.package,
icon: req.body.icon,
phone: user.phone,
telegram: user.telegram,
collectivized: req.body.collectivized,
modality: req.body.modality
}); });
}); if(travel.title==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.description==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.from==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.to==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.date==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.title==undefined)
{
return res.status(500).jsonp("empty inputs");
}
travel.save(function(err, travel) {
if(err) return res.send(500, err.message);
//res.status(200).jsonp(travel);
travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
if(err) res.send(500, err.message);
res.status(200).jsonp(travels);
});
});//end of travel.save
});//end of usermodel.find
}; };
@@ -124,59 +128,79 @@ exports.updateTravel = function(req, res) {
//DELETE //DELETE
exports.deleteTravel = function(req, res) { exports.deleteTravel = function(req, res) {
travelModel.findById(req.params.id, function(err, travel) { userModel.find({
travel.remove(function(err) { token: req.headers['x-access-token']
if(err) return res.send(500, err.message); }, function(err, users){
var user=users[0];
travelModel.find({date: {$gte: new Date()}}, function(err, travels) { travelModel.findById(req.params.id, function(err, travel) {
if(err) res.send(500, err.message); if(travel.owner==user.username)
res.status(200).jsonp(travels); {
}); travel.remove(function(err) {
}) if(err) return res.send(500, err.message);
travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
if(err) res.send(500, err.message);
res.status(200).jsonp(travels);
});
});
}
});
}); });
}; };
/* join */ /* join */
exports.addJoin = function(req, res) { exports.addJoin = function(req, res) {
travelModel.findById(req.params.travelId, function(err, travel){ userModel.find({
console.log(travel.title); token: req.headers['x-access-token']
var join = { }, function(err, users){
joinedUserId: req.body.joinedUserId, var user=users[0];
joinedUsername: req.body.joinedUsername,
acceptedUserId: req.body.acceptedUserId,
joinedAvatar: req.body.joinedAvatar
};
travel.joins.push(join);
travel.save(function(err, travel) { travelModel.findById(req.params.travelId, function(err, travel){
if(err) return res.send(500, err.message); console.log(travel.title);
//res.status(200).jsonp(travel); var join = {
travelModel.find({date: {$gte: new Date()}}, function(err, travels) { joinedUserId: user._id,
if(err) res.send(500, err.message); joinedUsername: user.username,
res.status(200).jsonp(travels); acceptedUserId: req.body.acceptedUserId,
joinedAvatar: user.avatar
};
travel.joins.push(join);
travel.save(function(err, travel) {
if(err) return res.send(500, err.message);
//res.status(200).jsonp(travel);
travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
if(err) res.send(500, err.message);
res.status(200).jsonp(travels);
});
}); });
}); });
}); });
}; };
exports.doUnjoin = function(req, res) { exports.doUnjoin = function(req, res) {
userModel.find({
token: req.headers['x-access-token']
}, function(err, users){
var user=users[0];
travelModel.findById(req.params.travelId, function(err, travel){ travelModel.findById(req.params.travelId, function(err, travel){
for(var i=0; i<travel.joins.length; i++) for(var i=0; i<travel.joins.length; i++)
{
if(travel.joins[i].joinedUsername==req.body.joinedUsername)
{ {
travel.joins.splice(i, 1); if(travel.joins[i].joinedUsername==user.username)
{
travel.joins.splice(i, 1);
}
} }
}
travel.save(function(err, travel) { travel.save(function(err, travel) {
if(err) return res.send(500, err.message); if(err) return res.send(500, err.message);
//res.status(200).jsonp(travel); //res.status(200).jsonp(travel);
travelModel.find({date: {$gte: new Date()}}, function(err, travels) { travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
if(err) res.send(500, err.message); if(err) res.send(500, err.message);
res.status(200).jsonp(travels); res.status(200).jsonp(travels);
});
}); });
}); });
}); });
@@ -215,26 +239,31 @@ exports.addComment = function(req, res) {
if(err) return res.send(500, err.message); if(err) return res.send(500, err.message);
res.status(200).jsonp(comment); res.status(200).jsonp(comment);
});*/ });*/
userModel.find({
token: req.headers['x-access-token']
}, function(err, users){
var user=users[0];
travelModel.findById(req.params.travelId, function(err, travel){ travelModel.findById(req.params.travelId, function(err, travel){
console.log(travel.title); console.log(travel.title);
var comment = { var comment = {
commentUserId: req.body.commentUserId, commentUserId: user._id,
commentUsername: req.body.commentUsername, commentUsername: user.username,
comment: req.body.comment, comment: req.body.comment,
commentAvatar: req.body.commentAvatar commentAvatar: user.avatar
}; };
travel.comments.push(comment); travel.comments.push(comment);
travel.save(function(err, travel) { travel.save(function(err, travel) {
if(err) return res.send(500, err.message); if(err) return res.send(500, err.message);
//res.status(200).jsonp(travel); //res.status(200).jsonp(travel);
travelModel.find({date: {$gte: new Date()}}, function(err, travels) { travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
if(err) res.send(500, err.message); if(err) res.send(500, err.message);
res.status(200).jsonp(travels); res.status(200).jsonp(travels);
});
}); });
}); });
}); });//end of userModel.find
}; };
exports.getCommentsByTravelId = function(req, res) { exports.getCommentsByTravelId = function(req, res) {

56
controllers/userController.js
View File

@@ -21,6 +21,7 @@ exports.findAllUsers = function(req, res) {
for(var i=0; i<users.length; i++) for(var i=0; i<users.length; i++)
{ {
users[i].password=""; users[i].password="";
users[i].token="";
console.log(users[i].password); console.log(users[i].password);
} }
@@ -38,6 +39,7 @@ exports.findById = function(req, res) {
//password deletion //password deletion
if(user!=null){ if(user!=null){
user.password=""; user.password="";
users.token="";
} }
res.status(200).jsonp(user); res.status(200).jsonp(user);
}); });
@@ -56,6 +58,7 @@ exports.findUserByUsername = function(req, res) {
// return the information including token as JSON // return the information including token as JSON
//res.jsonp(user); //res.jsonp(user);
user.password=""; user.password="";
users.token="";
console.log(user); console.log(user);
res.status(200).jsonp(user[0]); res.status(200).jsonp(user[0]);
@@ -95,7 +98,7 @@ exports.addUser = function(req, res) {
{ {
return res.status(500).jsonp("empty inputs"); return res.status(500).jsonp("empty inputs");
} }
user.save(function(err, user) { user.save(function(err, user) {
if(err) return res.send(500, err.message); if(err) return res.send(500, err.message);
res.status(200).jsonp(user); res.status(200).jsonp(user);
@@ -104,13 +107,19 @@ exports.addUser = function(req, res) {
/* fav */ /* fav */
exports.addFav = function(req, res) { exports.addFav = function(req, res) {
var tokenuser;
userModel.find({
token: req.headers['x-access-token']
}, function(err, users){
tokenuser=users[0];
});
userModel.findById(req.params.userId, function(err, user){ userModel.findById(req.params.userId, function(err, user){
// first search if user have already said like // first search if user have already said like
var favRepeated=false; var favRepeated=false;
for(var i=0; i<user.favs.length; i++) for(var i=0; i<user.favs.length; i++)
{ {
if(user.favs[i].username==req.body.username) if(user.favs[i].username==tokenuser.username)
{ {
favRepeated=true; favRepeated=true;
} }
@@ -119,9 +128,9 @@ exports.addFav = function(req, res) {
if(favRepeated==false) if(favRepeated==false)
{ {
var fav = { var fav = {
userId: req.body.userId, userId: tokenuser._id,
username: req.body.username, username: tokenuser.username,
avatar: req.body.avatar avatar: tokenuser.avatar
}; };
user.favs.push(fav); user.favs.push(fav);
@@ -143,11 +152,17 @@ exports.addFav = function(req, res) {
}); });
}; };
exports.doUnfav = function(req, res) { exports.doUnfav = function(req, res) {
var tokenuser;
userModel.find({
token: req.headers['x-access-token']
}, function(err, users){
tokenuser=users[0];
});
userModel.findById(req.params.userId, function(err, user){ userModel.findById(req.params.userId, function(err, user){
for(var i=0; i<user.favs.length; i++) for(var i=0; i<user.favs.length; i++)
{ {
if(user.favs[i].username==req.body.username) if(user.favs[i].username==tokenuser.username)
{ {
user.favs.splice(i, 1); user.favs.splice(i, 1);
} }
@@ -178,6 +193,7 @@ exports.updateUser = function(req, res) {
user.save(function(err) { user.save(function(err) {
if(err) return res.send(500, err.message); if(err) return res.send(500, err.message);
user.password=""; user.password="";
users.token="";
res.status(200).jsonp(user); res.status(200).jsonp(user);
}); });
}); });
@@ -221,17 +237,23 @@ exports.login = function(req, res) {
//expiresInMinutes: 1440 // expires in 24 hours //expiresInMinutes: 1440 // expires in 24 hours
//expiresIn: '60m' //expiresIn: '60m'
}); });
console.log(user); user.token=token;
// return the information including token as JSON user.save(function(err, user) {
user.password=""; if(err) return res.send(500, err.message);
res.json({ //res.status(200).jsonp(travel);
success: true, console.log(user);
message: 'Enjoy your token!', // return the information including token as JSON
token: token, user.password="";
avatar: user.avatar, res.json({
userid: user._id, success: true,
userdata: user message: 'Enjoy your token!',
}); token: token,
avatar: user.avatar,
userid: user._id,
userdata: user
});
});
} }
} }

1
models/userModel.js
View File

@@ -7,6 +7,7 @@ var mongooseUniqueValidator = require('mongoose-unique-validator');
var userSchema = new Schema({ var userSchema = new Schema({
username: { type: String, unique: true }, username: { type: String, unique: true },
password: { type: String }, password: { type: String },
token: { type: String },
description: { type: String }, description: { type: String },
avatar: { type: String }, avatar: { type: String },
mail: { type: String }, mail: { type: String },