From 320ca19c49c4ddbedbd95ffdd481994892f263ff Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Fri, 22 Sep 2017 20:31:26 +0200
Subject: Use env variables for logging and oauth control

---
 src/api/socket.js                         | 10 ++++++++--
 src/containers/auth/Login.js              |  2 +-
 src/store/configure-store.js              | 23 +++++++++++++++--------
 src/store/middlewares/dummy-middleware.js |  3 +++
 4 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 src/store/middlewares/dummy-middleware.js

(limited to 'src')

diff --git a/src/api/socket.js b/src/api/socket.js
index 298cf948..b5bb9b37 100644
--- a/src/api/socket.js
+++ b/src/api/socket.js
@@ -29,12 +29,18 @@ export function sendSocketRequest(request, callback) {
 
     socket.emit("request", request);
 
-    console.log("Sent socket request:", request);
+    if (process.env.NODE_ENV !== 'production') {
+        console.log("Sent socket request:", request);
+    }
 }
 
 function onSocketResponse(json) {
     const response = JSON.parse(json);
-    console.log("Received socket response:", response);
+
+    if (process.env.NODE_ENV !== 'production') {
+        console.log("Received socket response:", response);
+    }
+
     callbacks[response.id](response);
     delete callbacks[response.id];
 }
diff --git a/src/containers/auth/Login.js b/src/containers/auth/Login.js
index be4b07ee..4b008da4 100644
--- a/src/containers/auth/Login.js
+++ b/src/containers/auth/Login.js
@@ -28,7 +28,7 @@ class LoginContainer extends React.Component {
 
         return (
             <GoogleLogin
-                clientId="311799954046-jv2inpg9nu7m0avcg6gulvkuvfgbtgb4.apps.googleusercontent.com"
+                clientId={process.env.REACT_APP_OAUTH_CLIENT_ID}
                 onSuccess={this.onAuthResponse.bind(this)}
                 onFailure={this.onAuthResponse.bind(this)}
                 className="login btn btn-primary"
diff --git a/src/store/configure-store.js b/src/store/configure-store.js
index a7f3ec31..0c5baa0b 100644
--- a/src/store/configure-store.js
+++ b/src/store/configure-store.js
@@ -6,23 +6,30 @@ import thunk from "redux-thunk";
 import {authRedirectMiddleware} from "../auth/index";
 import rootReducer from "../reducers/index";
 import rootSaga from "../sagas/index";
+import {dummyMiddleware} from "./middlewares/dummy-middleware";
 import {viewportAdjustmentMiddleware} from "./middlewares/viewport-adjustment";
 
 const sagaMiddleware = createSagaMiddleware();
-const logger = createLogger();
+
+let logger;
+if (process.env.NODE_ENV !== 'production') {
+    logger = createLogger();
+}
+
+const middlewares = [
+    process.env.NODE_ENV === 'production' ? dummyMiddleware : logger,
+    thunk,
+    sagaMiddleware,
+    authRedirectMiddleware,
+    viewportAdjustmentMiddleware,
+];
 
 export default function configureStore() {
     const store = createStore(
         rootReducer,
         compose(
             persistState("auth"),
-            applyMiddleware(
-                logger,
-                thunk,
-                sagaMiddleware,
-                authRedirectMiddleware,
-                viewportAdjustmentMiddleware,
-            )
+            applyMiddleware(...middlewares)
         )
     );
     sagaMiddleware.run(rootSaga);
diff --git a/src/store/middlewares/dummy-middleware.js b/src/store/middlewares/dummy-middleware.js
new file mode 100644
index 00000000..eb87e713
--- /dev/null
+++ b/src/store/middlewares/dummy-middleware.js
@@ -0,0 +1,3 @@
+export const dummyMiddleware = store => next => action => {
+    next(action);
+};
-- 
cgit v1.2.3