From b5592f28aed439f4611d3eaa9984707560c3ff67 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 3 Nov 2018 08:53:57 +0100
Subject: [PATCH] Shared Key Tested, new client version

---
 .gitignore               |  1 +
 client/package.json      |  2 +-
 server/.env.example      |  1 +
 server/app.js            | 10 +++++-----
 server/package-lock.json |  5 +++++
 server/package.json      |  5 +++--
 6 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 server/.env.example

diff --git a/.gitignore b/.gitignore
index f4502b15d..164dcd1ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ server/node_modules/*
 client/src/auth/Auth0.js
 server/auth/Auth0.js
 server/models/MongoDB.js
+server/.env
diff --git a/client/package.json b/client/package.json
index 9cfdcd586..3e764bdf9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@advancedalgos/users-client",
   "description": "Advanced Algos Users client-side web app",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "main": "src/index.js",
   "dependencies": {
     "@material-ui/core": "^3.2.0",
diff --git a/server/.env.example b/server/.env.example
new file mode 100644
index 000000000..273f33020
--- /dev/null
+++ b/server/.env.example
@@ -0,0 +1 @@
+PRESHARED_GATEWAY_KEY=SHARED_KEY
diff --git a/server/app.js b/server/app.js
index b6e2c3700..c1489108c 100644
--- a/server/app.js
+++ b/server/app.js
@@ -10,21 +10,21 @@ const mongoose = require('mongoose')
 const mongodbConfig = require('./models/MongoDB')
 const checkJwt = require('./auth/middleware/jwt')
 const logger = require('./utils/logger')
-
 const wrongPreshared = require('./errors/notAllowed.json')
-
 const cors = require('cors')
 
+require('dotenv').config()
+
 const app = express()
 
 // Checking preshared key
 app.post('/graphql', (req, res, next) => {
   if (req.headers.preshared === process.env.PRESHARED_GATEWAY_KEY) {
-    next();
+    next()
   } else {
-    res.send(wrongPreshared);
+    res.send(wrongPreshared)
   }
-});
+})
 
 // Allow crosss-origin requests
 app.use(cors())
diff --git a/server/package-lock.json b/server/package-lock.json
index 6e2f22e09..a31e0b5a1 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -337,6 +337,11 @@
         "kuler": "1.0.1"
       }
     },
+    "dotenv": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.1.0.tgz",
+      "integrity": "sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw=="
+    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
diff --git a/server/package.json b/server/package.json
index db1a3063b..b3f69c6f9 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,8 +1,8 @@
 {
   "name": "server",
   "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
+  "description": "Advanced Algos Users Backedn API",
+  "main": "app.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "cors": "^2.8.4",
+    "dotenv": "^6.1.0",
     "express": "^4.16.3",
     "express-graphql": "^0.6.12",
     "express-jwt": "^5.3.1",