secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Detect blocked popups

Browse Source
This commit is contained in:
James Barnsley
2017-01-05 21:13:37 +13:00
parent 7e2547cea7
commit 99f706cb9d
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
auth.php
View File

@ -94,10 +94,15 @@ function getAuthorizationCode( $url ){
var timer = setInterval(checkPopup, 1000);
function checkPopup(){
if( typeof(popup) !== 'undefined' && popup ){
if( popup.closed ){
window.parent.postMessage( 'closed', '*' );
clearInterval(timer);
}
}else{
window.parent.postMessage( 'blocked', '*' );
clearInterval(timer);
}
}
</script>

3
src/js/components/SpotifyAuthenticationFrame.js
View File

@ -35,6 +35,8 @@ class SpotifyAuthenticationFrame extends React.Component{
frameUrl: '//jamesbarnsley.co.nz/auth.php?action=frame',
authorizing: false
})
}else if(event.data == 'blocked'){
self.props.uiActions.createNotification('Popup blocked. Please allow popups and try again.','bad')
}else{
// only allow incoming data from our authorized authenticator proxy
@ -59,7 +61,6 @@ class SpotifyAuthenticationFrame extends React.Component{
frameUrl: '//jamesbarnsley.co.nz/auth.php?action=authorize&app='+location.protocol+'//'+window.location.host,
authorizing: true
})
this.props.uiActions.createNotification('No popup? Your browser may have blocked it...')
}
renderAuthorizeButton(){