From 100b65f037bfd4bf4230fe75dbb662767b07f42d Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Fri, 20 Oct 2017 20:43:22 +1300
Subject: [PATCH] Spotify backend token refresh no longer using callbacks

---
 mopidy_iris/core.py                |  5 ++++-
 src/js/services/spotify/actions.js | 27 +++++++++------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py
index 52e152eb..345fa67f 100755
--- a/mopidy_iris/core.py
+++ b/mopidy_iris/core.py
@@ -637,7 +637,10 @@ class IrisCore(object):
             self.spotify_token = token
 
             if (callback):
-                callback(token)
+                callback({
+                    'status': 1,
+                    'spotify_token': token
+                })
             else:
                 return token
 
diff --git a/src/js/services/spotify/actions.js b/src/js/services/spotify/actions.js
index 6cd12d55..969dd869 100755
--- a/src/js/services/spotify/actions.js
+++ b/src/js/services/spotify/actions.js
@@ -157,24 +157,15 @@ function refreshToken(dispatch, getState){
             $.ajax(config)
                 .then(
                     response => {
-                        if (response.response_code == 200){
-                            var token = response.response;
-                            token.token_expiry = new Date().getTime() + (token.expires_in * 1000 );
-                            token.source = 'mopidy';
-                            dispatch({
-                                type: 'SPOTIFY_TOKEN_REFRESHED',
-                                access_token_provider: 'backend',
-                                data: token
-                            });
-                            resolve(token);  
-
-                        } else {  
-                            dispatch({ type: 'SPOTIFY_DISCONNECTED' })
-                            reject({
-                                config: config,
-                                error: response
-                            })                        
-                        }
+                        var token = response.spotify_token;
+                        token.token_expiry = new Date().getTime() + (token.expires_in * 1000 );
+                        token.source = 'mopidy';
+                        dispatch({
+                            type: 'SPOTIFY_TOKEN_REFRESHED',
+                            access_token_provider: 'backend',
+                            data: token
+                        });
+                        resolve(token);
 
                     },
                     (xhr, status, error) => {