Merge pull request #314 from plotly/use-env-var-for-auth-frontend

Use env var for auth frontend

Author: tarzzz

Dockerfile

@@ -52,4 +52,4 @@ RUN yarn run heroku-postbuild
 
 ENV PLOTLY_CONNECTOR_PORT 9494
 EXPOSE 9494
-ENTRYPOINT yarn run start-headless
+ENTRYPOINT yarn run build-web && yarn run start-headless

app/components/Configuration.react.js

@@ -14,7 +14,8 @@ class Configuration extends Component {
         this.state = {
             isMenuOpen: false,
             username: cookie.load('db-connector-user'),
-            authDisabled: cookie.load('db-connector-auth-disabled')
+            /* global PLOTLY_ENV */
+            authDisabled: !PLOTLY_ENV.AUTH_ENABLED
         };
         this.toggle = this.toggle.bind(this);
         this.close = this.close.bind(this);

app/components/Login.react.js

@@ -126,7 +126,8 @@ class Login extends Component {
     }
     buildOauthUrl() {
         const {domain} = this.state;
-        const oauthClientId = 'isFcew9naom2f1khSiMeAtzuOvHXHuLwhPsM7oPt';
+        /* global PLOTLY_ENV */
+        const oauthClientId = PLOTLY_ENV.OAUTH2_CLIENT_ID;
 
         const redirect_uri = baseUrlWrapped;
         return (

backend/routes.js

@@ -200,16 +200,6 @@ export default class Servers {
         Logger.log(`Listening at: ${protocol}://${domain}:${port}`);
         server.listen(port);
 
-        // Set AUTH_ENABLED into a cookie so that frontend can show login-modal accordingly:
-        server.use((req, res, next) => {
-            const authEnabled = getSetting('AUTH_ENABLED');
-            if (!authEnabled || that.isElectron) {
-                res.setCookie('db-connector-auth-disabled', true);
-            }
-
-            next();
-        });
-
         server.get(/\/static\/?.*/, restify.serveStatic({
             directory: `${__dirname}/../`
         }));

webpack.config.web.js

@@ -2,6 +2,13 @@ import webpack from 'webpack';
 import baseConfig from './webpack.config.base';
 import path from 'path';
 
+const AUTH_ENABLED = process.env.PLOTLY_CONNECTOR_AUTH_ENABLED ?
+                     JSON.parse(process.env.PLOTLY_CONNECTOR_AUTH_ENABLED) : true;
+
+const OAUTH2_CLIENT_ID = process.env.PLOTLY_CONNECTOR_OAUTH2_CLIENT_ID ?
+    JSON.stringify(process.env.PLOTLY_CONNECTOR_OAUTH2_CLIENT_ID) :
+    JSON.stringify('isFcew9naom2f1khSiMeAtzuOvHXHuLwhPsM7oPt');
+
 const config = {
     ...baseConfig,
 
@@ -23,6 +30,16 @@ const config = {
         new webpack.DefinePlugin({
             __DEV__: false,
             'process.env.NODE_ENV': JSON.stringify('production')
+        }),
+
+        // This is used to pass environment variables to frontend
+        // detailed discussions on this ticket:
+        // https://github.com/plotly/streambed/issues/10436
+        new webpack.DefinePlugin({
+            'PLOTLY_ENV': {
+                'AUTH_ENABLED': AUTH_ENABLED,
+                'OAUTH2_CLIENT_ID': OAUTH2_CLIENT_ID
+            }
         })
     ],