surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix: setlang

Browse Source 
- Completed work: page '/vref' (Verify registration) OK
This commit is contained in:
Paolo Arena
2019-01-02 01:59:01 +01:00
parent de00989ea6
commit 1f88ee3cf2
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -5,7 +5,7 @@
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "nodemon server/server.js", "start": "nodemon server/server.js",
"test": "export NODE_ENV=test || SET NODE_ENV=test && mocha server/**/*.test.js", "test": "export NODE_ENV=development || SET NODE_ENV=development && mocha server/**/*.test.js",
"start:prod": "NODE_ENV=production node server/server.js", "start:prod": "NODE_ENV=production node server/server.js",
"test-watch": "nodemon --exec 'npm test'" "test-watch": "nodemon --exec 'npm test'"
}, },

3
server/config/config.js
View File

@@ -9,9 +9,6 @@ process.env.LINK_UPDATE_PASSWORD = '/updatepwd';
process.env.NOME_APP1 = 'FreePlanet'; process.env.NOME_APP1 = 'FreePlanet';
process.env.KEY_APP_ID='KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF'; process.env.KEY_APP_ID='KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF';
process.env.SEND_EMAIL = '1';
console.log("FILE : " + file); console.log("FILE : " + file);
require('dotenv').config({path: file}); require('dotenv').config({path: file});

2
server/sendemail.js
View File

@@ -99,7 +99,7 @@ module.exports = {
} }
}, },
getlinkReg: function (idapp, idreg) { getlinkReg: function (idapp, idreg) {
strlinkreg = this.getHostByIdApp(idapp) + "/#" + process.env.LINKVERIF_REG + `?idapp=${idapp}&idlink=${idreg}`; strlinkreg = this.getHostByIdApp(idapp) + process.env.LINKVERIF_REG + `?idapp=${idapp}&idlink=${idreg}`;
return strlinkreg; return strlinkreg;
}, },
getlinkRequestNewPassword: function (idapp, user, tokenforgot) { getlinkRequestNewPassword: function (idapp, user, tokenforgot) {

21
server/server.js
View File

@@ -4,8 +4,6 @@ const _ = require('lodash');
const cors = require('cors'); const cors = require('cors');
var fs = require('fs'); var fs = require('fs');
var http = require('http');
var https = require('https');
const port = process.env.PORT; const port = process.env.PORT;
@@ -16,13 +14,15 @@ if (process.env.NODE_ENV === 'production') {
var privateKey = fs.readFileSync(process.env.PATH_CERT_KEY, 'utf8'); var privateKey = fs.readFileSync(process.env.PATH_CERT_KEY, 'utf8');
var certificate = fs.readFileSync(process.env.PATH_SERVER_CRT, 'utf8'); var certificate = fs.readFileSync(process.env.PATH_SERVER_CRT, 'utf8');
var credentials = {key: privateKey, cert: certificate}; var credentials = {key: privateKey, cert: certificate};
porthttp = port + 1 var https = require('https');
}else{ }else{
porthttp = port var http = require('http');
} }
console.log("DB: " + process.env.DATABASE); console.log("DB: " + process.env.DATABASE);
console.log("PORT: " + process.env.PORT); console.log("PORT: " + 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');
@@ -273,14 +273,15 @@ app.delete('/users/me/token', authenticate, (req, res) => {
}); });
}); });
var httpServer = http.createServer(app);
var httpsServer = https.createServer(credentials, app);
console.log("httpServer: port ", porthttp);
httpServer.listen(porthttp);
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
var httpsServer = https.createServer(credentials, app);
console.log("httpsServer: port ", port); console.log("httpsServer: port ", port);
httpsServer.listen(port); httpsServer.listen(port);
}else{
console.log("httpServer: port ", port);
var httpServer = http.createServer(app);
httpServer.listen(port);
} }
//app.listen(port, () => { //app.listen(port, () => {
@@ -301,5 +302,5 @@ function eseguitest() {
console.log("linkreg = " + sendemail.getlinkReg(1, "myusername")); console.log("linkreg = " + sendemail.getlinkReg(1, "myusername"));
} }
//sendemail.sendEmail_Registration("en", "paolo.arena77@gmail.com", "paoloar77", "miapwd", 1, "http://provalink.com"); // sendemail.sendEmail_Registration("en", "paolo.arena77@gmail.com", "paoloar77", 1, "http://provalink.com");
} }