add host,port,domain into config

Author: tadjik1

app.js

@@ -4,8 +4,6 @@ const config = require('./config');
 
 const app = new Koa();
 
-app.keys = config.keys;
-
 app.use(require('@koa/cors')());
 app.use(require('koa-bodyparser')());
 app.use(require('koa-static')(path.join(__dirname, 'public')));

config.js

@@ -4,12 +4,14 @@ require('dotenv').config({
 });
 
 const PORT = process.env.PORT || 3000;
-const HOST = process.env.HOST || `http://localhost:${PORT}`;
+const HOST = process.env.HOST || '127.0.0.1';
+
+const DOMAIN = process.env.DOMAIN || `http://${HOST}${PORT !== 80 ? ':' + PORT : ''}`;
 
 module.exports = {
   port: PORT,
   host: HOST,
-  keys: ['killer is Jim'],
+  domain: DOMAIN,
   mongodb: {
     uri: (process.env.NODE_ENV === 'test')
       ? 'mongodb://localhost/any-shop-test'
@@ -27,22 +29,22 @@ module.exports = {
     github: {
       app_id: process.env.GITHUB_APP_ID || 'github_app_id',
       app_secret: process.env.GITHUB_APP_SECRET || 'github_app_secret',
-      callback_uri: `${HOST}/oauth/github`,
+      callback_uri: `${DOMAIN}/oauth/github`,
       options: {
         scope: ['user:email'],
       },
     },
     yandex: {
       app_id: process.env.YANDEX_APP_ID || 'yandex_app_id',
       app_secret: process.env.YANDEX_APP_SECRET || 'yandex_app_secret',
-      callback_uri: `${HOST}/oauth/yandex`,
+      callback_uri: `${DOMAIN}/oauth/yandex`,
       options: {
       },
     },
     vkontakte: {
       app_id: process.env.VKONTAKTE_APP_ID || 'vkontakte_app_id',
       app_secret: process.env.VKONTAKTE_APP_SECRET || 'vkontakte_app_secret',
-      callback_uri: `${HOST}/oauth/vkontakte`,
+      callback_uri: `${DOMAIN}/oauth/vkontakte`,
       options: {
         scope: ['email'],
       },

controllers/orders.js

@@ -20,7 +20,7 @@ module.exports.checkout = async function checkout(ctx, next) {
       address: ctx.user.email,
     },
     subject: 'Подтверждение заказа',
-    locals: {href: config.host, product: product.title, price: `${product.price}₽`},
+    locals: {href: config.domain, product: product.title, price: `${product.price}₽`},
     template: 'order',
   });
 

controllers/registration.js

@@ -20,7 +20,7 @@ module.exports.register = async (ctx, next) => {
       address: user.email,
     },
     subject: 'Подтвердите почту',
-    locals: {href: `${config.host}/confirm/${verificationToken}`},
+    locals: {href: `${config.domain}/confirm/${verificationToken}`},
     template: 'confirmation',
   });
 

ecosystem.json

@@ -7,8 +7,9 @@
       "instances": 1,
       "env": {
         "NODE_ENV": "production",
+        "HOST": "0.0.0.0",
         "PORT": 80,
-        "HOST": "http://nodejs-shop.javascript.info"
+        "DOMAIN": "http://nodejs-shop.javascript.info"
       }
     }
   ]

index.js

@@ -3,8 +3,8 @@ const config = require('./config');
 const socket = require('./libs/socket');
 const logger = require('./libs/logger');
 
-const server = app.listen(config.port, () => {
-  logger.info(`App is running on http://localhost:${config.port}`);
+const server = app.listen(config.port, config.host, () => {
+  logger.info(`App is running on ${config.host}:${config.port}`);
 });
 
 socket(server);