diff --git a/config/config.js b/config/config.js deleted file mode 100644 index 4454a7e..0000000 --- a/config/config.js +++ /dev/null @@ -1,15 +0,0 @@ -import dotenv from 'dotenv'; -import _ from 'lodash'; - -const result = dotenv.config(); - -let envs; - -if (!('error' in result)) { - envs = result.parsed; -} else { - envs = {}; - _.each(process.env, (value, key) => envs[key] = value); -} - -module.exports = envs; \ No newline at end of file diff --git a/routes/users.js b/routes/users.js index d4d3027..313911f 100644 --- a/routes/users.js +++ b/routes/users.js @@ -5,7 +5,6 @@ const auth = require("../middleware/auth"); const User = require("../schemas/User"); const config = require("config"); -import { jwtSecret } from '../config/config'; router.post("/register", async (req, res) => { try { @@ -61,8 +60,7 @@ router.post("/login", async (req, res) => { const isMatch = await bcrypt.compare(password, user.password); if (!isMatch) return res.status(400).json({ msg: "Invalid credentials." }); - //const token = jwt.sign({ id: user._id },config.get('jwtSecret')); - const token = jwt.sign({ id: user._id }, jwtSecret); + const token = jwt.sign({ id: user._id },config.get('jwtSecret')); if(token) return res .json({ token, diff --git a/server.js b/server.js index 8137bb1..c36f518 100644 --- a/server.js +++ b/server.js @@ -2,7 +2,6 @@ const express = require("express"); const config = require("config"); const mongoose = require("mongoose"); const cors = require("cors"); -import { mongoURI } from './config/config'; // set up express @@ -17,8 +16,7 @@ app.listen(PORT, () => console.log(`The server has started on port: ${PORT}`)); // set up mongoose mongoose.connect( - //config.get('mongoURI'), - mongoURI, + config.get('mongoURI'), { useNewUrlParser: true, useUnifiedTopology: true,