Merge pull request #103 from plotly/hot-fix-maintenance-pr

Hot fix maintenance pr
plotly · Oct 5, 2016 · 70e69a5 · 70e69a5
2 parents 997ea6f + 1fde15b
commit 70e69a5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/backend/main.development.js b/backend/main.development.js
@@ -4,7 +4,6 @@ import {contains} from 'ramda';
 import {Logger} from './logger';
 import {SequelizeManager, OPTIONS} from './sequelizeManager';
 import {ipcMessageReceive,
-        serverMessageReceive,
         CHANNEL} from './messageHandler';
 import {setupHTTP, setupHTTPS, findSelfSignedCert} from './setupServers';
 import {setupMenus} from './menus';
@@ -60,7 +59,7 @@ app.on('ready', () => {
         // what to do when a message through IPC is received
         ipcMain.on(CHANNEL, ipcMessageReceive(responseTools));
         // what to do when a message through API is received
-        setupHTTP(serverMessageReceive, responseTools);
+        setupHTTP(responseTools);
 
         mainWindow.webContents.send(CHANNEL, {canSetupHTTPS});
 
@@ -69,7 +68,7 @@ app.on('ready', () => {
             mainWindow.webContents.send(CHANNEL, {hasSelfSignedCert});
             // if user has certificates, setup the HTTPS server right away
             if (hasSelfSignedCert) {
-                setupHTTPS(serverMessageReceive, responseTools);
+                setupHTTPS(responseTools);
             }
         }
 

diff --git a/backend/sequelizeManager.js b/backend/sequelizeManager.js
@@ -130,7 +130,7 @@ export class SequelizeManager {
             dialectOptions: {ssl}
         };
 
-        this.log(`Creating a connection for user ${username}`, 1);
+        this.log(`Creating a connection for user ${username}`, 2);
 
         const subDialect = dialect;
 
@@ -226,7 +226,7 @@ export class SequelizeManager {
         if (Object.keys(this.sessions).length > 0) {
             setSessionTo = Object.keys(this.sessions)[0];
         }
-        this.log(`${setSessionTo}`, 1);
+        this.log(`Selecting session ${setSessionTo}`, 2);
         return new Promise(
             (resolve, reject) => {
                 this.setSessionSelected(Object.keys(this.sessions)[0]);
@@ -269,7 +269,7 @@ export class SequelizeManager {
 
             let options = {dialect, host, port, storage};
 
-            this.log(`Switchin to a new database ${databaseToUse}`, 1);
+            this.log(`Switching to a new database ${databaseToUse}`, 2);
 
             if (subDialect === 'redshift') {
                 // avoid auto-dection

diff --git a/backend/setupServers.js b/backend/setupServers.js
@@ -6,7 +6,7 @@ import {replace, splitAt} from 'ramda';
 import YAML from 'yamljs';
 
 import {setupRoutes} from './routes';
-import {CHANNEL} from './messageHandler';
+import {serverMessageReceive, CHANNEL} from './messageHandler';
 
 // generic directories
 const HOSTS = '/etc/hosts';
@@ -93,20 +93,20 @@ let httpServer;
 let httpsServer;
 
 export const newOnPremSession = (
-    domain, serverMessageReceive, responseTools
+    domain, responseTools
 ) => {
     addAcceptedDomain(domain);
     if (httpServer) {
         httpServer.close();
-        setupHTTP(serverMessageReceive, responseTools);
+        setupHTTP(responseTools);
     } else {
         httpsServer.close();
-        setupHTTPS(serverMessageReceive, responseTools);
+        setupHTTPS(responseTools);
     }
 };
 
 // sets up the server itself, called by setupHTTPS() function
-const setupSecureRestifyServer = ({serverMessageReceive, responseTools}) => {
+const setupSecureRestifyServer = (responseTools) => {
 
     const {sequelizeManager, OPTIONS} = responseTools;
 
@@ -115,7 +115,7 @@ const setupSecureRestifyServer = ({serverMessageReceive, responseTools}) => {
         certificate: fs.readFileSync(csrFile)
     };
 
-    sequelizeManager.log('Closing http server.', 1);
+    sequelizeManager.log('Closing HTTP server.', 1);
     if (httpServer) {
         httpServer.close();
     }
@@ -147,7 +147,7 @@ const setupSecureRestifyServer = ({serverMessageReceive, responseTools}) => {
 
 // http
 
-export function setupHTTP(serverMessageReceive, responseTools) {
+export function setupHTTP(responseTools) {
 
     httpServer = restify.createServer();
     httpServer.use(restify.queryParser());
@@ -171,7 +171,7 @@ export function setupHTTP(serverMessageReceive, responseTools) {
  * These scripts require sudo and prompt for an admin password
  */
 
-export function setupHTTPS(serverMessageReceive, responseTools) {
+export function setupHTTPS(responseTools) {
 
     const {sequelizeManager, mainWindow, OPTIONS} = responseTools;
     const log = (args) => sequelizeManager.log(args);
@@ -209,9 +209,7 @@ export function setupHTTPS(serverMessageReceive, responseTools) {
         fs.accessSync(keyFile, fs.F_OK);
         fs.accessSync(csrFile, fs.F_OK);
         log('Certificate and key files already exist.', 1);
-        setupSecureRestifyServer(
-            {keyFile, csrFile, serverMessageReceive, responseTools}
-        );
+        setupSecureRestifyServer(responseTools);
         mainWindow.webContents.send(CHANNEL, {hasSelfSignedCert: true});
 
     } catch (e) {
@@ -226,14 +224,11 @@ export function setupHTTPS(serverMessageReceive, responseTools) {
                     log(error, 0);
                 } else {
                     log('New key and certificate generated', 1);
-                    log('Closing HTTP Server', 1);
                     mainWindow.webContents.send(CHANNEL, {
                         hasSelfSignedCert: true
                     });
                     // setup server with those keys
-                    setupSecureRestifyServer(
-                        {keyFile, csrFile, serverMessageReceive, responseTools}
-                    );
+                    setupSecureRestifyServer(responseTools);
                 }
         });
 

diff --git a/backend/tasks.js b/backend/tasks.js
@@ -89,7 +89,7 @@ export function executeTask(responseTools, responseSender, payload) {
 
 		case TASKS.SETUP_HTTPS_SERVER: {
             log('Setting up https server...', 1);
-            setupHTTPS(serverMessageReceive, responseTools);
+            setupHTTPS(responseTools);
 			break;
 		}
 
@@ -99,7 +99,7 @@ export function executeTask(responseTools, responseSender, payload) {
 
 		case TASKS.NEW_ON_PREM_SESSION: {
             log(`Adding domain ${message} to CORS`, 1);
-			newOnPremSession(message, serverMessageReceive, responseTools);
+			newOnPremSession(message, responseTools);
 			break;
 		}