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

Config includes spotify-user for rendering in Settings

Browse Source
This commit is contained in:
James Barnsley
2017-02-06 13:00:21 +13:00
parent 94c947e90e
commit 93eabe59c2
8 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/services/spotify/actions.js
View File

@ -100,6 +100,7 @@ function refreshToken( dispatch, getState ){
},
error => {
dispatch({ type: 'SPOTIFY_DISCONNECTED' })
dispatch(uiActions.createNotification('Could not refresh token','bad'))
console.error('Could not refresh token', error)
reject(error)
}
@ -126,6 +127,7 @@ function refreshToken( dispatch, getState ){
},
error => {
dispatch({ type: 'SPOTIFY_DISCONNECTED' })
dispatch(uiActions.createNotification('Could not refresh token','bad'))
console.error('Could not refresh token', error)
reject(error)
}

14
src/js/services/spotify/middleware.js
View File

@ -13,20 +13,10 @@ const SpotifyMiddleware = (function(){
switch(action.type){
case 'CONFIG':
if (!state.spotify.country || !state.spotify.locale){
store.dispatch( spotifyActions.setConfig(action.data.config) )
}
break
case 'SPOTIFY_CONNECT':
store.dispatch( spotifyActions.getMe() )
break
case 'SPOTIFY_DISCONNECTED':
store.dispatch( uiActions.createNotification('Spotify disconnected','bad') )
break
case 'SPOTIFY_CREATE_PLAYLIST':
if( !store.getState().spotify.authorized ){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
@ -103,8 +93,8 @@ const SpotifyMiddleware = (function(){
next(action)
// only resolve if radio is enabled
if( action.data.radio.enabled ){
store.dispatch(spotifyActions.resolveRadioSeeds(action.data.radio))
if( action.radio.enabled ){
store.dispatch(spotifyActions.resolveRadioSeeds(action.radio))
}
break