- fix: return the item saved

This commit is contained in:
Paolo Arena
2019-02-08 17:11:33 +01:00
parent 87378fe732
commit 318ff7a798
7 changed files with 35 additions and 17 deletions

View File

@@ -1,4 +1,6 @@
DATABASE=FreePlanet DATABASE=FreePlanet
UDB=paofreeplanet
PDB=suerteFreePlanet@1A
SEND_EMAIL=1 SEND_EMAIL=1
PORT=3000 PORT=3000
URLBASE_APP1=https://freeplanet.app URLBASE_APP1=https://freeplanet.app

View File

@@ -10,7 +10,17 @@ mongoose.plugin(schema => {
mongoose.set('debug', false); mongoose.set('debug', false);
mongoose.connect(process.env.MONGODB_URI, { useMongoClient: true, promiseLibrary: require('bluebird') }) var options = {
// user: process.env.UDB,
// pass: process.env.PDB,
useMongoClient: true,
promiseLibrary: require('bluebird')
};
// mongoose.connect(process.env.MONGODB_URI + '?authSource=admin', { options })
mongoose.connect(process.env.MONGODB_URI, { options })
.then(() => .then(() =>
console.log('connection succesful ' + process.env.MONGODB_URI + ' db: ' + process.env.DATABASE) console.log('connection succesful ' + process.env.MONGODB_URI + ' db: ' + process.env.DATABASE)
) )

View File

@@ -5,18 +5,19 @@ const tools = require('../tools/general');
var authenticate = (req, res, next) => { var authenticate = (req, res, next) => {
var token = req.header('x-auth'); var token = req.header('x-auth');
// console.log("TOKEN = " + token); tools.mylogshow("TOKEN = " + token);
User.findByToken(token).then((user) => { User.findByToken(token).then((user) => {
// tools.mylogshow('userid', user._id)
if (!user) { if (!user) {
return Promise.reject(); return Promise.reject();
} }
tools.mylogshow('userid', user._id)
req.user = user; req.user = user;
req.token = token; req.token = token;
next(); next();
}).catch((e) => { }).catch((e) => {
tools.mylogshow("ERR = " + e);
res.status(401).send(); res.status(401).send();
}); });
}; };

View File

@@ -92,7 +92,7 @@ router.post(process.env.LINK_UPDATE_PASSWORD, (req, res) => {
// Salva lo User // Salva lo User
user.save().then(() => { user.save().then(() => {
res.header('x-auth', token).send(user); // Ritorna il token di ritorno res.header('x-auth', token).send({user}); // Ritorna il token di ritorno
}); });
}) })
} }

View File

@@ -32,8 +32,9 @@ router.post('/', authenticate, (req, res) => {
return res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC }); return res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
} }
if (todo.userId !== String(req.user._id)) { if (String(todo.userId) !== String(req.user._id)) {
// I'm trying to write something not mine! // I'm trying to write something not mine!
tools.mylog('todo.userId = ', todo.userId, 'req.user._id', req.user._id)
return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER }); return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER });
} }
@@ -46,9 +47,13 @@ router.post('/', authenticate, (req, res) => {
sendNotificationToUser(todo.userId, 'New Todo', 'New Todo added!', '/' + todo.category, 'todo'); sendNotificationToUser(todo.userId, 'New Todo', 'New Todo added!', '/' + todo.category, 'todo');
todo.save().then((doc) => { todo.save().then((writeresult) => {
// tools.mylogshow('ID SAVED :', doc._id) let idobj = writeresult._id;
res.send(doc); Todo.findById(idobj)
.then(record => {
tools.mylog('REC SAVED :', record);
res.send({record});
})
}).catch((e) => { }).catch((e) => {
console.log(e.message); console.log(e.message);
res.status(400).send(e); res.status(400).send(e);
@@ -160,7 +165,7 @@ router.patch('/:id', authenticate, (req, res) => {
router.get('/:userId', authenticate, (req, res) => { router.get('/:userId', authenticate, (req, res) => {
var userId = req.params.userId; var userId = req.params.userId;
// tools.mylogshow('GET : ', req.params); tools.mylog('GET : ', req.params);
if (!ObjectID.isValid(userId)) { if (!ObjectID.isValid(userId)) {
return res.status(404).send(); return res.status(404).send();
@@ -173,7 +178,7 @@ router.get('/:userId', authenticate, (req, res) => {
// Extract all the todos of the userId only // Extract all the todos of the userId only
Todo.findAllByUserId(userId).then((todos) => { Todo.findAllByUserId(userId).then((todos) => {
// tools.mylogshow('todos', todos) tools.mylog('todos', todos)
res.send({ todos }); res.send({ todos });
}).catch((e) => { }).catch((e) => {
console.log(e); console.log(e);

View File

@@ -99,11 +99,11 @@ router.post('/login', (req, res) => {
usertosend.verified_email = user.verified_email; usertosend.verified_email = user.verified_email;
// tools.mylog("user.verified_email:" + user.verified_email); // tools.mylog("user.verified_email:" + user.verified_email);
// tools.mylog("usertosend.userId", usertosend.userId); tools.mylog("usertosend.userId", usertosend.userId);
// tools.mylog("usertosend:"); // tools.mylog("usertosend:");
// tools.mylog(usertosend); // tools.mylog(usertosend);
res.header('x-auth', token).send(usertosend); res.header('x-auth', token).send({usertosend, code: server_constants.RIS_CODE_OK});
// tools.mylog("TROVATOOO!"); // tools.mylog("TROVATOOO!");
}); });
} }

View File

@@ -81,11 +81,11 @@ app.use('/todos', todos_router);
app.use('/users', users_router); app.use('/users', users_router);
// catch 404 and forward to error handler // catch 404 and forward to error handler
app.use(function (req, res, next) { // app.use(function (req, res, next) {
var err = new Error('Not Found'); // var err = new Error('Not Found');
err.status = 404; // err.status = 404;
next(err); // next(err);
}); // });
// app.set('views', path.join(__dirname, 'views')); // app.set('views', path.join(__dirname, 'views'));