Merge pull request #14 from rotsen91/modularize

Modularize Routes File

config/pm2.config.json

@@ -1,6 +1,6 @@
-{
-  "name": "CVE-API",
+{	
+  "name": "cve-services",
   "script": "./src/index.js",
   "instances": 0,
   "exec_mode": "cluster"
-}
+}

package.json

@@ -47,6 +47,6 @@
   "scripts": {
     "docs": "./node_modules/apidoc/bin/apidoc -i src/ -o apidoc/",
     "lint": "node node_modules/eslint/bin/eslint.js src/  --fix",
-    "start:dev": "./node_modules/pm2/bin/pm2 start ./src/config/pm2.config.json --env dev && ./node_modules/pm2/bin/pm2 logs"
+    "start:dev": "./node_modules/pm2/bin/pm2-dev start ./config/pm2.config.json --env dev && ./node_modules/pm2/bin/pm2 logs"
   }
 }

src/controller/IdController.js

@@ -32,7 +32,7 @@ const uuidv4 = require('uuid/v4');
 */
 const allocateCveId = (request, response) => {
     // create cve id
-    var cveid = new cveId.CveId({id: 'CVE-' + Date().getFullYear().toString() + '-' + uuidv4()});
+    const cveid = new cveId.CveId({id: 'CVE-' + Date().getFullYear().toString() + '-' + uuidv4()});
     // save in mongo
     cveid.save(function (err, cveid) {
         if (err) {

src/routes.js → src/controller/cve.controller/cve.controller.js

@@ -1,26 +1,23 @@
-var express = require('express');
-var router = express.Router()
-var middleware = require('./middleware/middleware')
-var cve_controller = require('./controller/CveController')
-//var id_controller = require('./controller/IdController')
+const middleware = require('../../middleware/middleware')
+const cve_controller = require('../CveController')
 
-router.get('/cve-id', function (req, res) {
+async function allocateCveId(req, res) {
     //id_controller.allocateCveId(req, res)
     res.send("NEW-CVE-ID");
-})
+}
 
-router.post('/cve', function (req, res) {
+async function cveSubmission(req, res) {
     // Check API secret to make sure it's valid and avoid open requests
     let cna = req.header('X-API-CNA')
     let author = req.header('X-API-AUTHOR')
     let secret = req.header('X-API-SECRET')
-    var error = middleware.validApiSecret(cna, author, secret)
+    let error = middleware.validApiSecret(cna, author, secret)
     if (error) {
         return error
     }
     // TODO: implement any additional steps needed to make sure it's safe to parse the JSON
     // Validate CVE JSON against JSON schema to avoid bad data
-    var error = middleware.validCveJSON(req.body)
+    let error = middleware.validCveJSON(req.body)
     if (error) {
         return error
     }
@@ -33,6 +30,9 @@ router.post('/cve', function (req, res) {
     // Pass CVE submission to CVE controller and therefore CPS
     cve_controller.submitCve(cna, cve)
     res.send("NEW-CVE-SUBMITTED")
-})
+}
 
-module.exports = router;
+module.exports = {
+    CVE_ID_ALLOCATION: allocateCveId,
+    CVE_SUBMISSION: cveSubmission
+}

src/controller/cve.controller/index.js

@@ -0,0 +1,9 @@
+
+const express = require('express');
+const router = express.Router()
+const controller = require('./cve.controller')
+
+router.post('/cve', controller.CVE_SUBMISSION);
+router.get('/cve-id', controller.CVE_ID_ALLOCATION);
+
+module.exports = router;

src/controller/test.controller/hello-world.js

@@ -0,0 +1,18 @@
+
+async function helloWorld(req, res) {
+    console.log('Hello world, called.');
+    res.status(200).json({
+        message: 'Hello world! Api works!'
+    });
+}
+
+async function helloWorld2(req, res) {
+    console.log('Hello world 2, called.');
+    res.status(200).json({
+        message: 'Hello world 2! Api works!'
+    });
+}
+module.exports = {
+    hello : helloWorld,
+    hello2 : helloWorld2
+}

src/controller/test.controller/index.js

@@ -0,0 +1,9 @@
+
+const express = require('express');
+const router = express.Router()
+const helloWorld = require('./hello-world')
+
+router.post('/hello', helloWorld.hello);
+router.get('/hello2', helloWorld.hello2);
+
+module.exports = router;

src/index.js

@@ -5,24 +5,20 @@ const cors = require('cors');
 const morgan = require('morgan');
 const mongoose = require('mongoose');
 const helmet = require('helmet');
-const routes = require('./routes');
-
+const dotenv = require('dotenv');
+const configureRoutes = require('./routes.config');
 const app = express();
+const configed = dotenv.config(); //This enables us to read from the .env file.
 
 app.use(morgan('combined'));
 app.use(bodyParser.json()); //parses incoming json
 app.use(cors());
 app.use(helmet()); //gives standard security <https://www.npmjs.com/package/helmet>
-app.use('/', routes);
+//app.use('/', routes);
+configureRoutes(app)
 // Make mongoose connection available globally
 global.mongoose = mongoose;
-//import 'reflect-metadata';
-//import { configureRoutes } from './routes';
-//import * as dotenv from 'dotenv';
-const dotenv = require('dotenv');
-//import { verifyRequester } from './middlewares/verification';
-//import { RESPONSE_ERROR_MESSAGE } from './constants';
-const configed = dotenv.config(); //This enables us to read from the .env file.
+
 
 //*********Middleware Config*********** */
 //if (process.env.NODE_ENV === 'dev') app.use(logger('dev')); //creates logs when NODE ENV is set to dev
@@ -33,7 +29,7 @@ const configed = dotenv.config(); //This enables us to read from the .env file.
 //configureRoutes(app); //configure app routes
 
 app.use(express.static('client-dist'))
-app.use('/*', express.static('client-dist'))
+app.use('/*', express.static('client-dist'))  
 
 const dbConnectionStr = (config.has('database.username') && config.has('database.userpass')) ?
   `mongodb://${config.get('database.username')}:${config.get('database.userpass')}@${config.get('database.host')}:${config.get('database.port')}/${config.get('database.name')}`:

src/model/cna.js

@@ -1,4 +1,4 @@
-import { mongoose } from "mongoose"
+const mongoose = require('mongoose');
 
 var CnaSchema = new mongoose.Schema({
     id: String,

src/model/cve-id.js

@@ -1,4 +1,4 @@
-import { mongoose } from "mongoose"
+const mongoose = require('mongoose');
 
 var CveIdSchema = new mongoose.Schema({
     id: String

src/model/cve.js

@@ -1,4 +1,4 @@
-import { mongoose } from "mongoose"
+const mongoose = require('mongoose');
 
 var CveSchema = new mongoose.Schema({
     id: String

src/model/user.js

@@ -1,4 +1,4 @@
-import { mongoose } from "mongoose"
+const mongoose = require('mongoose');
 
 var UserSchema = new mongoose.Schema({
     id: String,

src/routes.config.js

@@ -0,0 +1,11 @@
+
+const TestRoutes = require('./controller/test.controller')
+const Cve_Controller = require('./controller/cve.controller')
+
+module.exports =  async function configureRoutes(app) {
+    //localhost:3000/test/hello
+    //localhost:3000/test/hello2
+    app.use('/test', TestRoutes);
+    app.use('/api', Cve_Controller);
+
+}