Resolved error Unknown modifier: $pushAll

adding this:

 mongoose.plugin(schema => { schema.options.usePushEach = true });
This commit is contained in:
Paolo Arena
2018-12-27 18:13:43 +01:00
parent a0d39dcbb1
commit 06cd4b8f0d
4 changed files with 66 additions and 36 deletions

10
.env.production Normal file
View File

@@ -0,0 +1,10 @@
DATABASE =FreePlanet
TEST_ATTIVO=1
PORT=3000
URLBASE_APP1=http://freeplanet.app
PORT_APP1=80
DOMAIN=mongodb://localhost:27017/
SIGNCODE=abc123
EMAIL_FROM=perseo774.un@gmail.com
EMAIL_PW=passpao1UNOK
SEND_EMAIL="0"

17
ecosystem.config.js Normal file
View File

@@ -0,0 +1,17 @@
module.exports = {
apps : [
{
name: "FreePlanetServerSide",
script: "./server/server.js",
watch: true,
env: {
"PORT": 3000,
"NODE_ENV": "development"
},
env_production: {
"PORT": 8080,
"NODE_ENV": "production",
}
}
]
}

View File

@@ -1,4 +1,3 @@
var bcrypt = require('bcrypt'); var bcrypt = require('bcrypt');
const mongoose = require('mongoose'); const mongoose = require('mongoose');
@@ -6,6 +5,8 @@ const validator = require('validator');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const _ = require('lodash'); const _ = require('lodash');
// Resolving error Unknown modifier: $pushAll
mongoose.plugin(schema => { schema.options.usePushEach = true });
var UserSchema = new mongoose.Schema({ var UserSchema = new mongoose.Schema({
email: { email: {
@@ -14,10 +15,10 @@ var UserSchema = new mongoose.Schema({
trim: true, trim: true,
minlength: 1, minlength: 1,
unique: true, unique: true,
validate: { /*validate: {
validator: validator.isEmail, validator: validator.isEmail,
message: '{VALUE} is not a valid email' message: '{VALUE} is not a valid email'
} }*/
}, },
idapp: { idapp: {
type: Number, type: Number,
@@ -76,15 +77,19 @@ UserSchema.methods.generateAuthToken = function () {
console.log("GENERA TOKEN : "); console.log("GENERA TOKEN : ");
var user = this; var user = this;
var access = 'auth'; var access = 'auth';
var token = jwt.sign({_id: user._id.toHexString(), access}, process.env.SIGNCODE).toString(); var token = jwt.sign({ _id: user._id.toHexString(), access }, process.env.SIGNCODE).toString();
// CANCELLA I PRECEDENTI ! // CANCELLA I PRECEDENTI !
user.tokens = []; user.tokens = [];
user.tokens.push({access, token}); user.tokens.push({ access, token });
return user.save().then(() => { return user.save()
.then(() => {
//console.log("TOKEN USCITA : " + token) //console.log("TOKEN USCITA : " + token)
return token; return token;
})
.catch(err => {
console.log("Error", err.message);
}); });
}; };
@@ -109,7 +114,7 @@ UserSchema.statics.findByCredentials = function (username, password) {
var User = this; var User = this;
var pwd = ""; var pwd = "";
return User.findOne({username: username}).then((user) => { return User.findOne({ username: username }).then((user) => {
if (!user) { if (!user) {
return null; return null;
} }
@@ -131,7 +136,6 @@ UserSchema.statics.findByCredentials = function (username, password) {
}; };
UserSchema.statics.findByUsername = function (username) { UserSchema.statics.findByUsername = function (username) {
var User = this; var User = this;
@@ -155,7 +159,7 @@ UserSchema.statics.findByLinkTokenforgot = function (idapp, email, tokenforgot)
return User.findOne({ return User.findOne({
'email': email, 'email': email,
'tokenforgot': tokenforgot, 'tokenforgot': tokenforgot,
'date_tokenforgot': { $gte: new Date(ISODate().getTime() - 1000 * 60 * 60 * 4) } , // 4 ore fa! 'date_tokenforgot': { $gte: new Date(ISODate().getTime() - 1000 * 60 * 60 * 4) }, // 4 ore fa!
'idapp': idapp, 'idapp': idapp,
}); });
}; };
@@ -192,7 +196,7 @@ UserSchema.methods.removeToken = function (token) {
return user.update({ return user.update({
$pull: { $pull: {
tokens: {token} tokens: { token }
} }
}); });
}; };
@@ -213,6 +217,6 @@ class Hero {
} }
module.exports = {User, Hero}; module.exports = { User, Hero };

View File

@@ -11,12 +11,12 @@ console.log("PORT: " + process.env.PORT);
console.log("MONGODB_URI: " + process.env.MONGODB_URI); console.log("MONGODB_URI: " + process.env.MONGODB_URI);
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
const {ObjectID} = require('mongodb'); const { ObjectID } = require('mongodb');
var {mongoose} = require('./db/mongoose'); var { mongoose } = require('./db/mongoose');
var {Todo} = require('./models/todo'); var { Todo } = require('./models/todo');
var {User} = require('./models/user'); var { User } = require('./models/user');
var {authenticate} = require('./middleware/authenticate'); var { authenticate } = require('./middleware/authenticate');
var sendemail = require('./sendemail'); var sendemail = require('./sendemail');
var reg = require('./reg/registration'); var reg = require('./reg/registration');
@@ -69,7 +69,7 @@ app.post(process.env.LINKVERIF_REG, (req, res) => {
user.verified_email = true; user.verified_email = true;
user.save().then(() => { user.save().then(() => {
//console.log("TROVATOOOOOO!"); //console.log("TROVATOOOOOO!");
res.send({code: server_constants.RIS_CODE_EMAIL_VERIFIED, msg: res.__('Email Verificata!')}); res.send({ code: server_constants.RIS_CODE_EMAIL_VERIFIED, msg: res.__('Email Verificata!') });
}); });
} }
} }
@@ -81,7 +81,6 @@ app.post(process.env.LINKVERIF_REG, (req, res) => {
}); });
// Faccio richiesta di una Nuova Password // Faccio richiesta di una Nuova Password
app.post(process.env.LINK_REQUEST_NEWPASSWORD, (req, res) => { app.post(process.env.LINK_REQUEST_NEWPASSWORD, (req, res) => {
var body = _.pick(req.body, ['idapp', 'email']); var body = _.pick(req.body, ['idapp', 'email']);
@@ -98,13 +97,13 @@ app.post(process.env.LINK_REQUEST_NEWPASSWORD, (req, res) => {
user.date_tokenforgot = new Date(); user.date_tokenforgot = new Date();
user.save().then(() => { user.save().then(() => {
sendemail.sendEmail_RequestNewPassword(getlang(res), user.email, user.idapp, user.tokenforgot); sendemail.sendEmail_RequestNewPassword(getlang(res), user.email, user.idapp, user.tokenforgot);
res.send({code: server_constants.RIS_CODE_OK, msg: ''}); res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
}); });
} }
}).catch((e) => { }).catch((e) => {
console.log(e); console.log(e);
res.status(400).send(); res.status(400).send();
res.send({code: server_constants.RIS_CODE_ERR, msg: e}); res.send({ code: server_constants.RIS_CODE_ERR, msg: e });
}); });
}); });
@@ -127,14 +126,14 @@ app.post(process.env.LINK_UPDATE_PASSWORD, (req, res) => {
user.password = password; user.password = password;
// Crea token // Crea token
token = user.generateAuthToken(); user.generateAuthToken().then(token => {
user.tokenforgot = ''; // Svuota il tokenforgot perché non ti servirà più... user.tokenforgot = ''; // Svuota il tokenforgot perché non ti servirà più...
// 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
}); });
})
} }
}).catch((e) => { }).catch((e) => {
console.log(e); console.log(e);
@@ -229,7 +228,7 @@ app.post('/users/login', (req, res) => {
console.log("CREDENZIALI ! "); console.log("CREDENZIALI ! ");
if (!user) { if (!user) {
console.log("NOT FOUND !"); console.log("NOT FOUND !");
res.status(404).send({code: server_constants.RIS_CODE_LOGIN_ERR}); res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR });
} else { } else {
return user.generateAuthToken().then((token) => { return user.generateAuthToken().then((token) => {
var usertosend = User(); var usertosend = User();
@@ -247,7 +246,7 @@ app.post('/users/login', (req, res) => {
} }
}).catch((e) => { }).catch((e) => {
console.log("ERR: " + e); console.log("ERR: " + e);
res.status(400).send({code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC}); res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
}); });
}); });
@@ -264,7 +263,7 @@ app.listen(port, () => {
console.log(`Server started at port ${port}`); console.log(`Server started at port ${port}`);
}); });
module.exports = {app}; module.exports = { app };
if (process.env.TEST_ATTIVO) { if (process.env.TEST_ATTIVO) {
eseguitest(); eseguitest();
@@ -272,7 +271,7 @@ if (process.env.TEST_ATTIVO) {
function eseguitest() { function eseguitest() {
if (true){ if (true) {
console.log("ESEGUI I TEST:"); console.log("ESEGUI I TEST:");
console.log("linkreg = " + sendemail.getlinkReg(1, "myusername")); console.log("linkreg = " + sendemail.getlinkReg(1, "myusername"));
} }