Merge pull request #87 from riselabs/OAuth2RefreshToken

change condition for refresh_token() according to expired_token response

Author: percyperez

fitbit/api.py

@@ -68,7 +68,7 @@ def make_request(self, url, data={}, method=None, **kwargs):
         try:
             auth = OAuth2(client_id=self.client_id, token=self.token)
             response = self._request(method, url, data=data, auth=auth, **kwargs)
-        except TokenExpiredError as e:
+        except HTTPUnauthorized as e:
             self.refresh_token()
             auth = OAuth2(client_id=self.client_id, token=self.token)
             response = self._request(method, url, data=data, auth=auth, **kwargs)
@@ -79,12 +79,11 @@ def make_request(self, url, data={}, method=None, **kwargs):
         if response.status_code == 401:
             d = json.loads(response.content.decode('utf8'))
             try:
-                if(d['errors'][0]['errorType'] == 'oauth' and
-                    d['errors'][0]['fieldName'] == 'access_token' and
-                    d['errors'][0]['message'].find('Access token invalid or expired:') == 0):
-                            self.refresh_token()
-                            auth = OAuth2(client_id=self.client_id, token=self.token)
-                            response = self._request(method, url, data=data, auth=auth, **kwargs)
+                if(d['errors'][0]['errorType'] == 'expired_token' and
+                    d['errors'][0]['message'].find('Access token expired:') == 0):
+                        self.refresh_token()
+                        auth = OAuth2(client_id=self.client_id, token=self.token)
+                        response = self._request(method, url, data=data, auth=auth, **kwargs)
             except:
                 pass
 
@@ -159,16 +158,12 @@ def refresh_token(self):
         obtained in step 2.
         the token is internally saved
         """
-
-        unenc_str = (self.client_id + ':' + self.client_secret).encode('utf8')
-        headers = {
-            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-            'Authorization': b'Basic ' + base64.b64encode(unenc_str)
-        }
         self.token = self.oauth.refresh_token(
             self.refresh_token_url,
             refresh_token=self.token['refresh_token'],
-            headers=headers)
+            auth=requests.auth.HTTPBasicAuth(self.client_id, self.client_secret)
+        )
+
         return self.token