Merge branch 'master' into fix/remove-webid-tls

RubenVerborgh · web-flow · commit b6c38920fde0 · 2018-07-16T04:48:05.000+02:00
diff --git a/popup-app/components/IdpSelect.js b/popup-app/components/IdpSelect.js
@@ -64,13 +64,7 @@ class IdpSelect extends React.Component {
       ...loginOptions,
       storage: postMessageStorage(window.opener, appOrigin)
     }
-    const maybeSession = await login(idp.url, loginOptions)
-    if (typeof maybeSession === 'object') {
-      await request({ method: 'foundSession', args: [maybeSession] })
-      window.close()
-    } else if (typeof maybeSession === 'function') {
-      maybeSession()
-    }
+    await login(idp.url, loginOptions)
   }
 
   render() {

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,7 @@ class IdpSelect extends React.Component {`
`64`	`64`	`...loginOptions,`
`65`	`65`	`storage: postMessageStorage(window.opener, appOrigin)`
`66`	`66`	`}`
`67`		`- const maybeSession = await login(idp.url, loginOptions)`
`68`		`- if (typeof maybeSession === 'object') {`
`69`		`- await request({ method: 'foundSession', args: [maybeSession] })`
`70`		`- window.close()`
`71`		`- } else if (typeof maybeSession === 'function') {`
`72`		`- maybeSession()`
`73`		`- }`
	`67`	`+ await login(idp.url, loginOptions)`
`74`	`68`	`}`
`75`	`69`
`76`	`70`	`render() {`