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

implemented users validation from admin accounts

Browse Source
This commit is contained in:
arnaucode
2017-09-01 11:20:15 +02:00
parent 1ffd3c0aef
commit 5384336d57
5 changed files with 179 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -30,6 +30,14 @@ code: https://github.com/arnaucode/carsincommonApp
- https (tls/ssl) - https (tls/ssl)
``` ```
### Configuration before run:
In the file adminConfig.js, put the sha256 of the password that allows to create new admins:
```js
module.exports = {
'passwordHash': 'Bzij4hEeEUpmXTWyS+X0LR+YcA8WFjP2P7qhW0sxA6s='/*password raw: adminPassword*/
};
```
#### RESOURCES using: #### RESOURCES using:

269
controllers/adminController.js
View File

@@ -2,6 +2,7 @@
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var adminModel = mongoose.model('adminModel'); var adminModel = mongoose.model('adminModel');
var userModel = mongoose.model('userModel'); var userModel = mongoose.model('userModel');
var userController = require('../controllers/userController');
var notificationModel = mongoose.model('notificationModel'); var notificationModel = mongoose.model('notificationModel');
var travelModel = mongoose.model('travelModel'); var travelModel = mongoose.model('travelModel');
var travelCtrl = require('../controllers/travelController'); var travelCtrl = require('../controllers/travelController');
@@ -388,121 +389,121 @@ exports.getUserNetwork = function(req, res) {
var nodes = []; var nodes = [];
var edges = []; var edges = [];
//for (var i = 0; i < users.length; i++) { //for (var i = 0; i < users.length; i++) {
var node = {
title: user.username,
label: user.username,
image: user.avatar,
shape: "image",
id: user._id,
group: user._id
};
var lNode = isNodeInNodes(node, nodes);
if (lNode < 0) {
nodes.push(node);
var uNode = nodes.length - 1;
}
for (var j = 0; j < user.likes.length; j++) {
/*console.log(i + ", " + j);
console.log(nodes);*/
var node = { var node = {
title: user.username, title: user.likes[j].username,
label: user.username, label: user.likes[j].username,
image: user.avatar, image: user.likes[j].avatar,
shape: "image", shape: "image",
id: user._id, id: user.likes[j]._id
};
var lNode = isNodeInNodes(node, nodes);
if (lNode < 0) {
//node no exist
nodes.push(node);
lNode = nodes.length - 1;
} else {
//node already exist
}
var edge = {
from: user._id,
to: user.likes[j]._id,
label: "like",
arrows: "to",
color: {
color: "#E57373" //red300
}
};
edges.push(edge);
}
for (var j = 0; j < user.travels.length; j++) {
/*console.log(i + ", " + j);
console.log(nodes);*/
var node = {
title: user.travels[j].title,
label: user.travels[j].title,
image: "img/" + user.travels[j].type + ".png",
shape: "image",
id: user.travels[j]._id,
value: "0.5",
group: user._id group: user._id
}; };
var lNode = isNodeInNodes(node, nodes); var lNode = isNodeInNodes(node, nodes);
if (lNode < 0) { if (lNode < 0) {
//node no exist
nodes.push(node); nodes.push(node);
var uNode = nodes.length - 1; lNode = nodes.length - 1;
} } else {
for (var j = 0; j < user.likes.length; j++) { //node already exist
/*console.log(i + ", " + j);
console.log(nodes);*/
var node = {
title: user.likes[j].username,
label: user.likes[j].username,
image: user.likes[j].avatar,
shape: "image",
id: user.likes[j]._id
};
var lNode = isNodeInNodes(node, nodes);
if (lNode < 0) {
//node no exist
nodes.push(node);
lNode = nodes.length - 1;
} else {
//node already exist
}
var edge = {
from: user._id,
to: user.travels[j]._id,
color: {
color: "#616161" //grey
} }
var edge = { };
from: user._id, edges.push(edge);
to: user.likes[j]._id, }
label: "like", //add users that has add like to the user
arrows: "to", userModel.find({
color: { likes: req.params.userid
color: "#E57373" //red300 })
} .exec(function(err, users) {
}; for (var i = 0; i < users.length; i++) {
edges.push(edge); /*console.log(i + ", " + j);
} console.log(nodes);*/
for (var j = 0; j < user.travels.length; j++) { var node = {
/*console.log(i + ", " + j); title: users[i].username,
console.log(nodes);*/ label: users[i].username,
var node = { image: users[i].avatar,
title: user.travels[j].title, shape: "image",
label: user.travels[j].title, id: users[i]._id
image: "img/" + user.travels[j].type + ".png",
shape: "image",
id: user.travels[j]._id,
value: "0.5",
group: user._id
};
var lNode = isNodeInNodes(node, nodes);
if (lNode < 0) {
//node no exist
nodes.push(node);
lNode = nodes.length - 1;
} else {
//node already exist
}
var edge = {
from: user._id,
to: user.travels[j]._id,
color: {
color: "#616161" //grey
}
};
edges.push(edge);
}
//add users that has add like to the user
userModel.find({
likes: req.params.userid
})
.exec(function(err, users) {
for (var i = 0; i < users.length; i++) {
/*console.log(i + ", " + j);
console.log(nodes);*/
var node = {
title: users[i].username,
label: users[i].username,
image: users[i].avatar,
shape: "image",
id: users[i]._id
};
var lNode = isNodeInNodes(node, nodes);
if (lNode < 0) {
//node no exist
nodes.push(node);
lNode = nodes.length - 1;
} else {
//node already exist
}
var edge = {
from: users[i]._id,
to: req.params.userid,
label: "like",
arrows: "to",
color: {
color: "#E57373" //red300
}
};
edges.push(edge);
}
var resp = {
nodes: nodes,
edges: edges
}; };
res.status(200).jsonp(resp); var lNode = isNodeInNodes(node, nodes);
}); if (lNode < 0) {
//node no exist
nodes.push(node);
lNode = nodes.length - 1;
} else {
//node already exist
}
var edge = {
from: users[i]._id,
to: req.params.userid,
label: "like",
arrows: "to",
color: {
color: "#E57373" //red300
}
};
edges.push(edge);
}
var resp = {
nodes: nodes,
edges: edges
};
res.status(200).jsonp(resp);
});
//} //}
@@ -510,3 +511,61 @@ exports.getUserNetwork = function(req, res) {
} }
}); });
}; };
// user validation
exports.validateUser = function(req, res) {
adminModel.findOne({
'token': req.headers['x-access-token']
})
.exec(function(err, admin) {
if (!admin) {
res.json({
success: false,
message: 'Admin not found'
});
} else if (admin) {
if (err) return res.send(500, err.message);
userModel.findOne({
_id: req.params.userid
})
.exec(function(err, user) {
if (err) return res.send(500, err.message);
user.validated = true;
user.save(function(err, user) {
if (err) return res.send(500, err.message);
userController.getUserById(req, res);
});
});
}
});
};
// user unvalidate
exports.unvalidateUser = function(req, res) {
adminModel.findOne({
'token': req.headers['x-access-token']
})
.exec(function(err, admin) {
if (!admin) {
res.json({
success: false,
message: 'Admin not found'
});
} else if (admin) {
if (err) return res.send(500, err.message);
userModel.findOne({
_id: req.params.userid
})
.exec(function(err, user) {
if (err) return res.send(500, err.message);
user.validated = false;
user.save(function(err, user) {
if (err) return res.send(500, err.message);
userController.getUserById(req, res);
});
});
}
});
};

4
controllers/travelController.js
View File

@@ -15,7 +15,7 @@ exports.getAllTravels = function(req, res) {
.limit(pageSize) .limit(pageSize)
.skip(pageSize * Number(req.query.page)) .skip(pageSize * Number(req.query.page))
.lean() .lean()
.populate('user', 'username avatar') .populate('user', 'username avatar validated')
.exec(function (err, travels) { .exec(function (err, travels) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
res.status(200).jsonp(travels); res.status(200).jsonp(travels);
@@ -25,7 +25,7 @@ exports.getAllTravels = function(req, res) {
exports.getTravelById = function (req, res) { exports.getTravelById = function (req, res) {
travelModel.findOne({_id: req.params.travelid}) travelModel.findOne({_id: req.params.travelid})
.lean() .lean()
.populate('user', 'username avatar telegram phone') .populate('user', 'username avatar validated telegram phone')
.populate('joins', 'username avatar') .populate('joins', 'username avatar')
.populate('joinPetitions', 'username avatar') .populate('joinPetitions', 'username avatar')
.populate('comments', 'comment user') .populate('comments', 'comment user')

1
models/userModel.js
View File

@@ -15,6 +15,7 @@ var userSchema = new Schema({
email: { type: String, required: true }, email: { type: String, required: true },
phone: { type: String }, phone: { type: String },
telegram: { type: String }, telegram: { type: String },
validated: { type: Boolean, default: false },
valorations: [{ valorations: [{
user: { user: {
type: mongoose.Schema.Types.ObjectId, type: mongoose.Schema.Types.ObjectId,

4
server.js
View File

@@ -126,6 +126,10 @@ apiRoutes.route('/admin/travels/id/:travelid')
.delete(adminCtrl.deleteTravel); .delete(adminCtrl.deleteTravel);
apiRoutes.route('/admin/users/id/:userid') apiRoutes.route('/admin/users/id/:userid')
.delete(adminCtrl.deleteUser); .delete(adminCtrl.deleteUser);
apiRoutes.route('/admin/users/validate/id/:userid')
.post(adminCtrl.validateUser);
apiRoutes.route('/admin/users/unvalidate/id/:userid')
.post(adminCtrl.unvalidateUser);
apiRoutes.route('/search/:searchstring') apiRoutes.route('/search/:searchstring')
.get(searchCtrl.searchByString); .get(searchCtrl.searchByString);