From 1f88ee3cf28a7c5d52feb294e80b8c29882994cd Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Wed, 2 Jan 2019 01:59:01 +0100
Subject: [PATCH] - Fix: setlang - Completed work: page '/vref' (Verify
 registration) OK

---
 package.json            |  2 +-
 server/config/config.js |  3 ---
 server/sendemail.js     |  2 +-
 server/server.js        | 21 +++++++++++----------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 71120e3..45b1097 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "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",
     "test-watch": "nodemon --exec 'npm test'"
   },
diff --git a/server/config/config.js b/server/config/config.js
index 10cca45..40a38d2 100644
--- a/server/config/config.js
+++ b/server/config/config.js
@@ -9,9 +9,6 @@ process.env.LINK_UPDATE_PASSWORD = '/updatepwd';
 process.env.NOME_APP1 = 'FreePlanet';
 process.env.KEY_APP_ID='KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF';
 
-
-process.env.SEND_EMAIL = '1';
-
 console.log("FILE : " + file);
 require('dotenv').config({path: file});
 
diff --git a/server/sendemail.js b/server/sendemail.js
index f0f4d5b..2c32772 100644
--- a/server/sendemail.js
+++ b/server/sendemail.js
@@ -99,7 +99,7 @@ module.exports = {
     }
   },
   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;
   },
   getlinkRequestNewPassword: function (idapp, user, tokenforgot) {
diff --git a/server/server.js b/server/server.js
index d5e87ac..ba16a8c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -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");
 }