Merge pull request #88 from ekonstantinidis/login-bug

Bug: Authenticate with GitHub

Author: ekonstantinidis

package.json

@@ -9,7 +9,7 @@
     "watch-js": "watchify -t babelify src/js/app.js -o build/js/app.js -v",
     "watch": "npm run build && grunt build && npm run watch-js & grunt watch",
     "start": "electron .",
-    "dist": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --version=0.30.2 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
+    "dist": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --version=0.31.0 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
     "lint": "eslint 'src/js/' 'src/js/app.js' 'main.js'",
     "test": "npm run lint && jest"
   },
@@ -92,8 +92,8 @@
   },
   "devDependencies": {
     "babel-eslint": "=4.0.10",
-    "electron-packager": "=5.0.1",
-    "electron-prebuilt": "=0.30.2",
+    "electron-packager": "=5.0.2",
+    "electron-prebuilt": "=0.31.0",
     "eslint": "=1.2.1",
     "grunt": "=0.4.5",
     "grunt-contrib-clean": "=0.6.0",

src/js/components/login.js

@@ -33,11 +33,10 @@ var Login = React.createClass({
     var authUrl = githubUrl + 'client_id=' + options.client_id + '&scope=' + options.scope;
     authWindow.loadUrl(authUrl);
 
-    authWindow.webContents.on('did-get-redirect-request', function (event, oldUrl, newUrl) {
-
-      var raw_code = /code=([^&]*)/.exec(newUrl) || null;
+    authWindow.webContents.on('will-navigate', function (event, url) {
+      var raw_code = /code=([^&]*)/.exec(url) || null;
       var code = (raw_code && raw_code.length > 1) ? raw_code[1] : null;
-      var error = /\?error=(.+)$/.exec(newUrl);
+      var error = /\?error=(.+)$/.exec(url);
 
       if (code || error) {
         // Close the browser if code found or error