Merge pull request #1121 from jakejarrett/bugfix/use-electron-5

Update code to support electron 5 & fixes login bug

Author: jakejarrett

main.js

@@ -54,16 +54,18 @@ function authenticateUser() {
 
   contents = authenticationWindow.webContents;
 
-  contents.on('did-get-redirect-request', (event, oldUrl, newUrl) => {
+  contents.on('did-navigate', (_event, url, httpResponseCode) => {
     const access_tokenStr = 'access_token=';
     const expires_inStr = '&expires_in';
     let accessToken;
 
-    if (newUrl.indexOf('access_token=') < 0) {
+    if (url.indexOf('access_token=') < 0) {
       return false;
     }
 
-    accessToken = newUrl.substring(newUrl.indexOf(access_tokenStr) + 13, newUrl.indexOf(expires_inStr));
+    accessToken = url.substring(url.indexOf(access_tokenStr) + 13, url.indexOf(expires_inStr));
+
+    accessToken = accessToken.split('&scope=')[0];
 
     setUserData(accessToken);
     authenticationWindow.destroy();
@@ -93,7 +95,10 @@ function initMainWindow() {
     minWidth: 800,
     minHeight: 640,
     center: true,
-    frame: false
+    frame: false,
+    webPreferences: {
+      nodeIntegration: true
+    }
   });
 
   mainWindow.loadURL(`file://${__dirname}/app/index.html`);

package.json

@@ -31,7 +31,7 @@
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-0": "^6.22.0",
     "babel-register": "^6.23.0",
-    "electron": "^1.6.11",
+    "electron": "^6.0.6",
     "electron-packager": "^8.5.1",
     "eslint": "^4.0.0",
     "eslint-plugin-react": "^7.1.0",