Merge remote-tracking branch 'origin/JWT_Infrastructure' into JWT_Inf…

…rastructure
ibishop · Feb 8, 2019 · b1c70c1 · b1c70c1
2 parents f3029c9 ae161ba
commit b1c70c1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/server/Configs.js b/server/Configs.js
diff --git a/server/handlers/authHandler.js b/server/handlers/authHandler.js
@@ -1,6  1,6 @@
 require('dotenv').config();
 const jwt = require('jsonwebtoken');
-const Configs = require('../Config');
 const Config = require('../Config');
 const databaseHandler = require('./databaseHandler');
 
 // Query database handler with signup request.
@@ -14,8  14,8 @@ let signup = async (req, res) => {
         // Retrieve json web token
         let token = jwt.sign(
           { username: username, password: password },
-          Configs.privateKey,
-          Configs.signOptions
           Config.privateKey,
           Config.signOptions
         );
 
         // Signup success.
@@ -56,8  56,8 @@ let login = async (req, res) => {
           // Retrieve json web token
           let token = jwt.sign(
             { username: username, password: password },
-            Configs.privateKey,
-            Configs.signOptions
             Config.privateKey,
             Config.signOptions
           );
 
           // Login success.

diff --git a/server/handlers/middleware.js b/server/handlers/middleware.js
@@ -1,5  1,5 @@
 const jwt = require('jsonwebtoken');
-const Configs = require('../Config');
 const Config = require('../Config');
 
 let checkToken = (req, res, next) => {
   // Express headers are auto converted to lowercase
@@ -11,8  11,8 @@ let checkToken = (req, res, next) => {
     // Determine if jwt token is legit
     let legit = jwt.verify(
       token,
-      Configs.publicKey,
-      Configs.verifyOptions,
       Config.publicKey,
       Config.verifyOptions,
       (err, decoded) => {
         if (err) {
           return res.json({

diff --git a/server/server.js b/server/server.js
@@ -4,7  4,7 @@ const app = express();
 const path = require('path');
 const bodyParser = require('body-parser');
 const authRoutes = require('./controller/authroutes');
-const Configs = require('./Config');
 const Config = require('./Config');
 const port = process.env.PORT || 4201;
 
 app.use(
@@ -18,6  18,6 @@ app.route('/*', (req, res) => {
 app.use(express.static(path.join(__dirname, '/../dist')));
 app.use(express.json()); //
 app.use(bodyParser.json());
-app.use(Configs.AccessControl);
 app.use(Config.AccessControl);
 app.use('/', authRoutes);
-app.listen(port, () => console.log(`Listening on port: ${port}...`));
 app.listen(port, () => console.log(`Listening on port: ${port}...`));