some fixes and cleanup

appinteractive · appinteractive · commit 35c8d156c75e · 2018-01-22T21:04:56.000+01:00
diff --git a/config/default.json b/config/default.json
@@ -1,7 +1,6 @@
 {
   "host": "localhost",
   "port": 3030,
-  "frontport": 3000,
   "baseURL": "http://localhost:3030",
   "public": "../public/",
   "paginate": {
diff --git a/config/production.json b/config/production.json
@@ -1,7 +1,7 @@
 {
   "host": "HOST",
   "port": "PORT",
-  "baseUrl": "BASE_URL",
+  "baseURL": "BASE_URL",
   "mongodb": "MONGO_DB",
   "smtpConfig": {
     "host": "SMTP_HOST",
diff --git a/server/services/auth-management/notifier.js b/server/services/auth-management/notifier.js
@@ -7,16 +7,8 @@ const EmailTemplate = require('email-templates').EmailTemplate;
 module.exports = function(app) {
   const returnEmail = app.get('defaultEmail');
 
-  function getBaseUrl() {
-    const port = (!app.get('frontport') || isProd) ? '' : ':' + app.get('frontport');
-    const host = app.get('host')|| 'localhost';
-    let protocol = app.get('protocol') || 'http';
-    protocol += '://';
-    return `${protocol}${host}${port}`;
-  }
-
   function getLink(type, hash) {
-    const baseUrl = getBaseUrl();
+    const baseUrl = app.get('baseURL');
     return `${baseUrl}/auth/${type}/${hash}`;
   }
 
@@ -31,7 +23,7 @@ module.exports = function(app) {
     const templatePath = path.join(__dirname, '../../../email-templates/account', templatename);
 
     const hashLink = getLink(linktype, user.verifyToken);
-    const baseUrl = getBaseUrl();
+    const baseUrl = app.get('baseURL');
 
     const template = new EmailTemplate(templatePath, {juiceOptions: {
       preserveMediaQueries: true,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"host": "localhost",`
`3`	`3`	`"port": 3030,`
`4`		`- "frontport": 3000,`
`5`	`4`	`"baseURL": "http://localhost:3030",`
`6`	`5`	`"public": "../public/",`
`7`	`6`	`"paginate": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"host": "HOST",`
`3`	`3`	`"port": "PORT",`
`4`		`- "baseUrl": "BASE_URL",`
	`4`	`+ "baseURL": "BASE_URL",`
`5`	`5`	`"mongodb": "MONGO_DB",`
`6`	`6`	`"smtpConfig": {`
`7`	`7`	`"host": "SMTP_HOST",`