fixed config paths

backend/bin/www

@@ -1,90 +1,34 @@
 #!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
+const { CONFIG } = require('../../config/backend');
 
 const app = require('../app');
-const debug = require('debug')('orchid-backend:server');
+const fs = require('fs');
 const http = require('http');
+const https = require('https');
 
-/**
- * Get port from environment and store in Express.
- */
+if (CONFIG.HTTP.ENABLED) {
+  const httpPort = CONFIG.HTTP.PORT;
+  app.set('port', httpPort);
 
-const port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
+  const httpServer = http.createServer(app);
+  httpServer.listen(httpPort);
 
-/**
- * Create HTTP server.
- */
-
-const server = http.createServer(app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
-
-/**
- * Normalize a port into a number, string, or false.
- */
-
-function normalizePort(val) {
-  const port = parseInt(val, 10);
-
-  if (isNaN(port)) {
-    // named pipe
-    return val;
-  }
-
-  if (port >= 0) {
-    // port number
-    return port;
-  }
-
-  return false;
+  httpServer.on('error', console.log);
+  httpServer.on('listening', console.log);
 }
 
-/**
- * Event listener for HTTP server "error" event.
- */
+if (CONFIG.HTTPS.ENABLED) {
+  const sslPort = CONFIG.HTTPS.PORT;
+  app.set('port', sslPort);
 
-function onError(error) {
-  if (error.syscall !== 'listen') {
-    throw error;
-  }
+  const privateKey = fs.readFileSync(CONFIG.HTTPS.PRIVATE_KEY, 'utf8');
+  const certificate = fs.readFileSync(CONFIG.HTTPS.CERTIFICATE, 'utf8');
+  const ca = fs.readFileSync(CONFIG.HTTPS.CA, 'utf8');
 
-  const bind = typeof port === 'string'
-    ? 'Pipe ' + port
-    : 'Port ' + port;
+  const sslServer = https.createServer({ privateKey, certificate, ca }, app);
 
-  // handle specific listen errors with friendly messages
-  switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
-      process.exit(1);
-      break;
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
-      process.exit(1);
-      break;
-    default:
-      throw error;
-  }
+  sslServer.listen(sslPort);
+  sslServer.on('error', console.log);
+  sslServer.on('listening', console.log);
 }
 
-/**
- * Event listener for HTTP server "listening" event.
- */
-
-function onListening() {
-  const addr = server.address();
-  const bind = typeof addr === 'string'
-    ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
-}

backend/config/db.js

@@ -1,15 +1,16 @@
-const user = 'user';
-const password = 'password';
-const hostname = 'vault48.org';
-const port = 27017;
-const db = 'map';
+const { CONFIG } = require('../../config/backend');
+
+const {
+  DB: {
+    USER, PASSWORD, HOSTNAME, PORT, DATABASE
+  }
+} = CONFIG;
 
 const mongoose = require('mongoose');
 mongoose.Promise = require('bluebird');
 
-mongoose.connect(`mongodb://${user}:${password}@${hostname}:${port}/${db}`, { });
+mongoose.connect(`mongodb://${USER}:${PASSWORD}@${HOSTNAME}:${PORT}/${DATABASE}`, { });
 const database = mongoose.connection;
 
 database.on('error', (err) => { console.error(`Database Connection Error: ${err}`); process.exit(2); });
 database.on('connected', () => { console.info('Succesfully connected to MongoDB Database'); });
-

backend/config/social.js

@@ -1,6 +0,0 @@
-module.exports.SOCIAL = {
-  VK: {
-    client_secret: 'Z71DsxoMF7PS9kayLuks',
-    client_id: 5987644,
-  }
-};

backend/routes/auth/social/vk.js

@@ -2,7 +2,7 @@ const { User } = require('../../../models');
 const axios = require('axios');
 const { generateUser } = require('../guest');
 const { STRINGS } = require('../../../config/strings');
-const { SOCIAL } = require('../../../config/social');
+const { CONFIG } = require('../../../../config/backend');
 
 const fetchUserData = async (req, res) => {
   const { query: { code } } = req;
@@ -12,8 +12,8 @@ const fetchUserData = async (req, res) => {
     'https://oauth.vk.com/access_token',
     {
       params: {
-        client_id: SOCIAL.VK.client_id,
-        client_secret: SOCIAL.VK.client_secret,
+        client_id: CONFIG.SOCIAL.VK.APP_ID,
+        client_secret: CONFIG.SOCIAL.VK.SECRET,
         code,
         redirect_uri: `http://${host}/auth/social/vk`,
       }