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

UserID

Browse Source
This commit is contained in:
James Barnsley
2017-10-31 08:36:32 +13:00
parent 9179cbcd93
commit d5752e1bac
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,13 +34,13 @@ const SpotifyMiddleware = (function(){
break break
case 'SPOTIFY_AUTHORIZATION_GRANTED': case 'SPOTIFY_AUTHORIZATION_GRANTED':
ReactGA.event({ category: 'Spotify', action: 'Authorization granted' }) ReactGA.event({ category: 'Spotify', action: 'Authorization granted' });
// Flush out the previous user's library // Flush out the previous user's library
store.dispatch(spotifyActions.flushLibrary()); store.dispatch(spotifyActions.flushLibrary());
next(action) next(action);
break break;
case 'SPOTIFY_AUTHORIZATION_REVOKED': case 'SPOTIFY_AUTHORIZATION_REVOKED':
var label = null var label = null
@ -51,7 +51,7 @@ const SpotifyMiddleware = (function(){
next(action) next(action)
// Now dispatch a getMe to get the backend-provided user // Now dispatch a getMe to get the backend-provided user
store.dispatch(spotifyActions.getMe()) store.dispatch(spotifyActions.getMe());
// Flush out the previous user's library // Flush out the previous user's library
store.dispatch(spotifyActions.flushLibrary()); store.dispatch(spotifyActions.flushLibrary());
@ -404,15 +404,16 @@ const SpotifyMiddleware = (function(){
// We've loaded 'me' and we are Anonymous currently // We've loaded 'me' and we are Anonymous currently
if (action.data && store.getState().pusher.username == 'Anonymous'){ if (action.data && store.getState().pusher.username == 'Anonymous'){
if (action.data.display_name !== null){ if (action.data.display_name !== null){
var name = action.data.display_name var name = action.data.display_name;
} else { } else {
var name = action.data.id var name = action.data.id;
} }
// Use 'me' name as my Pusher username // Use 'me' name as my Pusher username
store.dispatch(pusherActions.setUsername(name)) store.dispatch(pusherActions.setUsername(name));
} }
ReactGA.event({ category: 'Spotify', action: 'Authorization verified', label: action.data.id }) ReactGA.set({userId: action.data.id});
ReactGA.event({category: 'Spotify', action: 'Authorization verified', label: action.data.id});
store.dispatch({ store.dispatch({
type: 'USER_LOADED', type: 'USER_LOADED',
@ -420,7 +421,7 @@ const SpotifyMiddleware = (function(){
user: action.data user: action.data
}) })
next(action) next(action);
break; break;
// This action is irrelevant to us, pass it on to the next middleware // This action is irrelevant to us, pass it on to the next middleware