Commit 3f6c3a8

committed

Merge pull request #88 from ekonstantinidis/login-bug

Bug: Authenticate with GitHub

2 parents d5fa3d2 + 1a672c6 commit 3f6c3a8Copy full SHA for 3f6c3a8

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"watch-js": "watchify -t babelify src/js/app.js -o build/js/app.js -v",`
`10`	`10`	`"watch": "npm run build && grunt build && npm run watch-js & grunt watch",`
`11`	`11`	`"start": "electron .",`
`12`		`- "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'",`
	`12`	`+ "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'",`
`13`	`13`	`"lint": "eslint 'src/js/' 'src/js/app.js' 'main.js'",`
`14`	`14`	`"test": "npm run lint && jest"`
`15`	`15`	`},`
`@@ -92,8 +92,8 @@`
`92`	`92`	`},`
`93`	`93`	`"devDependencies": {`
`94`	`94`	`"babel-eslint": "=4.0.10",`
`95`		`- "electron-packager": "=5.0.1",`
`96`		`- "electron-prebuilt": "=0.30.2",`
	`95`	`+ "electron-packager": "=5.0.2",`
	`96`	`+ "electron-prebuilt": "=0.31.0",`
`97`	`97`	`"eslint": "=1.2.1",`
`98`	`98`	`"grunt": "=0.4.5",`
`99`	`99`	`"grunt-contrib-clean": "=0.6.0",`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,10 @@ var Login = React.createClass({`
`33`	`33`	`var authUrl = githubUrl + 'client_id=' + options.client_id + '&scope=' + options.scope;`
`34`	`34`	`authWindow.loadUrl(authUrl);`
`35`	`35`
`36`		`- authWindow.webContents.on('did-get-redirect-request', function (event, oldUrl, newUrl) {`
`37`		`-`
`38`		`- var raw_code = /code=([^&]*)/.exec(newUrl) \|\| null;`
	`36`	`+ authWindow.webContents.on('will-navigate', function (event, url) {`
	`37`	`+ var raw_code = /code=([^&]*)/.exec(url) \|\| null;`
`39`	`38`	`var code = (raw_code && raw_code.length > 1) ? raw_code[1] : null;`
`40`		`- var error = /\?error=(.+)$/.exec(newUrl);`
	`39`	`+ var error = /\?error=(.+)$/.exec(url);`
`41`	`40`
`42`	`41`	`if (code \|\| error) {`
`43`	`42`	`// Close the browser if code found or error`

Comments

(0)