From 0af7c14f94d038326e503d752cda082e295579f2 Mon Sep 17 00:00:00 2001
From: Lukas Lindqvist <mail@lukaslindqvist.se>
Date: Fri, 8 Jun 2018 10:19:29 +0200
Subject: [PATCH 1/3] Added env-template file to gateway.

---
 .gitignore                 | 1 +
 apps/gateway/.env-template | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 apps/gateway/.env-template

diff --git a/.gitignore b/.gitignore
index a5fca94..6335c64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ terraform
 lerna-debug.log
 yarn-error.log
 .eslintcache
+.env
\ No newline at end of file
diff --git a/apps/gateway/.env-template b/apps/gateway/.env-template
new file mode 100644
index 0000000..843a243
--- /dev/null
+++ b/apps/gateway/.env-template
@@ -0,0 +1,4 @@
+PHOTO_GARDEN_PROVIDERS_GOOGLE_DRIVE_CLIENT_ID=
+PHOTO_GARDEN_PROVIDERS_GOOGLE_DRIVE_CLIENT_SECRET=
+PHOTO_GARDEN_PROVIDERS_GOOGLE_DRIVE_CLIENT_REDIRECT_URI=
+PHOTO_GARDEN_PROVIDERS_DROPBOX_CLIENT_ID=
\ No newline at end of file

From 5bfa54d881aae398025e912d782dfbb3b2e14a51 Mon Sep 17 00:00:00 2001
From: Lukas Lindqvist <mail@lukaslindqvist.se>
Date: Fri, 8 Jun 2018 10:33:34 +0200
Subject: [PATCH 2/3] Added dotenv package to gateway service.

---
 apps/gateway/app.js       | 22 +++++++++++++---------
 apps/gateway/package.json |  1 +
 package.json              |  9 +++++++--
 yarn.lock                 |  4 ++++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/apps/gateway/app.js b/apps/gateway/app.js
index 8dfbc12..6a88c71 100644
--- a/apps/gateway/app.js
+++ b/apps/gateway/app.js
@@ -1,3 +1,4 @@
+const dotenv = require("dotenv").config();
 const providers = require("./providers");
 const logger = require("logging");
 const express = require("express");
@@ -25,8 +26,8 @@ app.use(
     activeDuration: 10 * 60 * 1000,
     cookie: {
       secure: false
-    }, 
-    saveUninitialized: true,
+    },
+    saveUninitialized: true
   })
 );
 
@@ -47,26 +48,29 @@ app.get("/logout", (req, res) => {
 });
 
 app.get("/user", [isAuthenticated, allowCors], (req, res) => {
-   res.json({ user: req.gardenSession.userIdentity });
+  res.json({ user: req.gardenSession.userIdentity });
 });
 
 function allowCors(req, res, next) {
   res.header("Access-Control-Allow-Origin", "http://localhost:3001");
-  res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-  res.header('Access-Control-Allow-Credentials', 'true');
+  res.header(
+    "Access-Control-Allow-Headers",
+    "Origin, X-Requested-With, Content-Type, Accept"
+  );
+  res.header("Access-Control-Allow-Credentials", "true");
   return next();
 }
 
 function isAuthenticated(req, res, next) {
-  req.gardenSession.userIdentity = '7509d0e0-702b-4758-bd65-203ea38cf756';
+  req.gardenSession.userIdentity = "7509d0e0-702b-4758-bd65-203ea38cf756";
   return next();
-  logger.info('SESSION IN GATEWAY', req.gardenSession)
+  logger.info("SESSION IN GATEWAY", req.gardenSession);
   if (req.gardenSession.userIdentity) {
     return next();
   } else {
-    res.status(401).send('You are not logged in');
+    res.status(401).send("You are not logged in");
   }
-  // 
+  //
   //res.redirect("http://localhost:3000/login");
 }
 // Mount providers
diff --git a/apps/gateway/package.json b/apps/gateway/package.json
index 43abe60..be57754 100755
--- a/apps/gateway/package.json
+++ b/apps/gateway/package.json
@@ -17,6 +17,7 @@
     "client-sessions": "^0.8.0",
     "communication": "^1.0.0",
     "config": "^1.0.0",
+    "dotenv": "^6.0.0",
     "dropbox-api": "^1.0.0",
     "express": "^4.16.2",
     "google-auth-library": "^0.12.0",
diff --git a/package.json b/package.json
index 61aa6fe..86e3f37 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,17 @@
     "url": "https://github.com/Etimo/photo-garden/issues"
   },
   "homepage": "https://github.com/Etimo/photo-garden#readme",
-  "workspaces": ["apps/*", "libs/*"],
+  "workspaces": [
+    "apps/*",
+    "libs/*"
+  ],
   "scripts": {
     "prettier": "prettier --write \"**/*.{js,json,css,md}\"",
     "pm2": "docker exec -ti photogarden_services_1 pm2"
   },
-  "pre-commit": ["prettier"],
+  "pre-commit": [
+    "prettier"
+  ],
   "dependencies": {},
   "devDependencies": {
     "eslint": "^4.19.1",
diff --git a/yarn.lock b/yarn.lock
index 23f399d..d7bdc86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2150,6 +2150,10 @@ dotenv@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
 
+dotenv@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
+
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"

From edee226928dc407a9436cf9f3751c5f5732f68c2 Mon Sep 17 00:00:00 2001
From: Lukas Lindqvist <mail@lukaslindqvist.se>
Date: Fri, 8 Jun 2018 10:36:07 +0200
Subject: [PATCH 3/3] Shortened dotenv require.

---
 apps/gateway/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gateway/app.js b/apps/gateway/app.js
index 6a88c71..c58d66b 100644
--- a/apps/gateway/app.js
+++ b/apps/gateway/app.js
@@ -1,4 +1,4 @@
-const dotenv = require("dotenv").config();
+require("dotenv").config();
 const providers = require("./providers");
 const logger = require("logging");
 const express = require("express");