Merge branch 'release/v18.2.8'

rowers/polarstuff.py

@@ -346,7 +346,7 @@ def get_polar_workouts(user):
 
     return exercise_list
 
-def register_user(user):
+def register_user(user, token):
     r = Rower.objects.get(user=user)
     if (r.polartoken == '') or (r.polartoken is None):
         s = "Token doesn't exist. Need to authorize"
@@ -355,7 +355,7 @@ def register_user(user):
         s = "Token expired. Needs to refresh"
         return custom_exception_handler(401,s)
 
-    authorizationstring = str('Bearer ' + r.polartoken)
+    authorizationstring = str('Bearer ' + token)
     headers = {
         'Content-Type': 'application/xml',
         'Authorization':authorizationstring,
@@ -372,7 +372,14 @@ def register_user(user):
     response = requests.post(url,params=params,headers=headers)
 
     if response.status_code != 200:
+        dologgin('polar.log',url)
         dologging('polar.log',response.status_code)
+        try:
+            dologging('polar.log',response.reason)
+            dologging('polar.log',response.text)
+        except KeyError:
+            pass
+
         return {}
 
     polar_user_data = response.json()

rowers/views/importviews.py

@@ -432,7 +432,7 @@ def rower_process_polarcallback(request):
         return HttpResponseRedirect(url)
 
     access_token, expires_in, user_id = polarstuff.get_token(code)
-    polar_user_data = polarstuff.register_user(request.user)
+    polar_user_data = polarstuff.register_user(request.user, access_token)
 
     try:
         user_id2 = polar_user_data['polar-user-id']