Skip to content

Commit

Permalink
feature(setup postgres with elephantSQL):
Browse files Browse the repository at this point in the history
use .env file to store db credentials
[Finishes #165401006]
  • Loading branch information
Cavdy committed Apr 17, 2019
1 parent b0cad84 commit 938cbba
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "banking web app",
"main": "app.js",
"scripts": {
"server": "DEBUG=querysuccess nodemon --exec babel-node ./server/v1/config/database.js",
"start": "node ./server/build/app.js",
"build": "babel -d ./server/build ./server/v1 -s",
"dev": "nodemon --exec babel-node ./server/v1/app.js",
Expand Down
5 changes: 4 additions & 1 deletion server/v1/config/database.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { Client } from 'pg';
import debug from 'debug';
import dotenv from 'dotenv';

const conString = 'postgres://xwrxubeu:u4wOQ6oxpvRCK6yWk5qK4rzaiisTPeoN@isilo.db.elephantsql.com:5432/xwrxubeu';
dotenv.config();

const conString = process.env.DB_CONFIG;

const client = new Client(conString);

Expand Down
5 changes: 4 additions & 1 deletion server/v1/controllers/login.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import jwt from 'jsonwebtoken';
import debug from 'debug';
import dotenv from 'dotenv';
import LoginService from '../services/login';

dotenv.config();

const LoginController = {
loginUser(req, res) {
const userData = req.body;
const loggedUser = LoginService.loginUser(userData);

return jwt.sign({ loggedUser }, '5634', (err, token) => {
return jwt.sign({ loggedUser }, process.env.JWTSECRETKEY, (err, token) => {
if (err) { debug('jwterror')(err); }
if (loggedUser[0] === 'Invalid format' || loggedUser[0] === 'incorrect credentials') {
res.json({
Expand Down
5 changes: 4 additions & 1 deletion server/v1/middleware/jwt.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import jwt from 'jsonwebtoken';
import dotenv from 'dotenv';

dotenv.config();

const jwtMiddleware = {
checkToken(req, res, next) {
Expand All @@ -14,7 +17,7 @@ const jwtMiddleware = {
}
},
verifyJwt(req, res, next) {
jwt.verify(req.token, '5634', (err, authorizedData) => {
jwt.verify(req.token, process.env.JWTSECRETKEY, (err, authorizedData) => {
if (err) {
return res.sendStatus(403);
}
Expand Down

0 comments on commit 938cbba

Please sign in to comment.