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

21
server/server.js
View File

@@ -4,8 +4,6 @@ const _ = require('lodash');
const cors = require('cors');
var fs = require('fs');
var http = require('http');
var https = require('https');
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 certificate = fs.readFileSync(process.env.PATH_SERVER_CRT, 'utf8');
var credentials = {key: privateKey, cert: certificate};
porthttp = port + 1
var https = require('https');
}else{
porthttp = port
var http = require('http');
}
console.log("DB: " + process.env.DATABASE);
console.log("PORT: " + process.env.PORT);
console.log("PORT: " + port);
console.log("MONGODB_URI: " + process.env.MONGODB_URI);
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') {
var httpsServer = https.createServer(credentials, app);
console.log("httpsServer: port ", port);
httpsServer.listen(port);
}else{
console.log("httpServer: port ", port);
var httpServer = http.createServer(app);
httpServer.listen(port);
}
//app.listen(port, () => {
@@ -301,5 +302,5 @@ function eseguitest() {
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");
}