stop using dotenv for config

4 files changed, 4 insertions, 19 deletions

diff --git a/index.js b/index.js
index 922f3d3d..8394f095 100644
--- a/index.js
+++ b/index.js
@@ -9,7 +9,6 @@ import cookieParser from 'cookie-parser'
 import core from 'bitcoin-core'
 import cors from 'cors'
 import crypto from 'crypto-js'
-import dotenv from 'dotenv'
 import express from 'express'
 import fb from 'fb'
 import fs from 'fs'
@@ -27,7 +26,6 @@ import zmq from 'zeromq'
 import authyVerify from './authy'
 import config from './config'
 
-dotenv.config()
 const l = console.log
 const authy = new Client({ key: config.authy.key })
 
@@ -654,13 +652,6 @@ const authy = new Client({ key: config.authy.key })
 
   let fetchRates
   (fetchRates = async () => {
-    const nonce = Date.now().toString()
-    const conf = config.quad
-    const signature = crypto.HmacSHA256(
-      nonce + conf.client_id + conf.key, 
-      conf.secret
-    ).toString()
-
     try {
       let res = await axios.get('https://api.kraken.com/0/public/Ticker?pair=XBTCAD')
       let ask = res.data.result.XXBTZCAD.c[0]
@@ -693,7 +684,7 @@ const authy = new Client({ key: config.authy.key })
       ) return res.status(401).end()
 
       let payload = { username: user.username }
-      let token = jwt.sign(payload, process.env.SECRET)
+      let token = jwt.sign(payload, config.jwt)
       res.cookie('token', token, { expires: new Date(Date.now() + 432000000) })
       res.send({ user, token })
     } catch(err) {
@@ -740,7 +731,7 @@ const authy = new Client({ key: config.authy.key })
       if (user.twofa && !(await authyVerify(user))) res.status(401).end()
 
       let payload = { username: user.username }
-      let token = jwt.sign(payload, process.env.SECRET)
+      let token = jwt.sign(payload, config.jwt)
       res.cookie('token', token, { expires: new Date(Date.now() + 432000000) })
       res.send({ user, token })
     } catch(err) {
diff --git a/package.json b/package.json
index 33ea10a7..6c8fa81f 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
     "cookie-parser": "^1.3.2",
     "cors": "^2.8.4",
     "crypto-js": "^3.1.9-1",
-    "dotenv": "^4.0.0",
     "email-validator": "^2.0.4",
     "express": "4.14.0",
     "express-graphql": "^0.6.12",
diff --git a/passport.js b/passport.js
index 730601d7..246dfba8 100644
--- a/passport.js
+++ b/passport.js
@@ -1,7 +1,6 @@
 import passport from 'passport'
 import jwt from 'passport-jwt'
-import dotenv from 'dotenv'
-dotenv.config()
+import config from './config'
 
 const l = console.log
 
@@ -14,7 +13,7 @@ module.exports = (db) => {
   passport.use(
     new jwt.Strategy({
       jwtFromRequest: jwt.ExtractJwt.fromExtractors([jwt.ExtractJwt.fromAuthHeaderAsBearerToken(), cookieExtractor]),
-      secretOrKey: process.env.SECRET
+      secretOrKey: config.jwt
     }, async (payload, next) => {
       try {
         let user = await db.User.findOne({
diff --git a/yarn.lock b/yarn.lock
index df4cf40a..80fffb08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2553,10 +2553,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-dotenv@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
-
 dottie@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz#45c2a3f48bd6528eeed267a69a848eaaca6faa6a"