From 9969fb8d291c94eb802549f00988dcecbbe11fa6 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 11 May 2018 09:35:47 +0200
Subject: [PATCH] fixed unicode response

---
 rowers/sporttracksstuff.py | 9 +++++++++
 rowers/views.py            | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py
index 94e1eddf..d8de7b20 100644
--- a/rowers/sporttracksstuff.py
+++ b/rowers/sporttracksstuff.py
@@ -102,6 +102,11 @@ def do_refresh_token(refreshtoken):
 	refresh_token = token_json['refresh_token']
     except KeyError:
 	refresh_token = refreshtoken
+    try:
+        expires_in = int(expires_in)
+    except (TypeError,ValueError):
+        expires_in = 0
+        
 
     return [thetoken,expires_in,refresh_token]
 
@@ -131,6 +136,10 @@ def get_token(code):
 	    refresh_token = token_json['refresh_token']
         except KeyError:
 	    refresh_token = refreshtoken
+        try:
+            expires_in = int(expires_in)
+        except (ValueError,TypeError):
+            expires_in = 0
     else:
         return [0,0,0]
 
diff --git a/rowers/views.py b/rowers/views.py
index e3f056f7..e06f9591 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -2662,6 +2662,7 @@ def rower_process_sporttrackscallback(request):
     access_token = res[0]
     expires_in = res[1]
     refresh_token = res[2]
+
     expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
     
     r = getrower(request.user)
@@ -9597,6 +9598,8 @@ def workout_sporttracksimport_view(request,message=""):
 	    if (r.sporttrackstoken == '') or (r.sporttrackstoken is None):
 		s = "Token doesn't exist. Need to authorize"
 		return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")
+            else:
+                return HttpResponseRedirect("/rowers/me/sporttracksrefresh/")
 	message = "Something went wrong in workout_sporttracksimport_view"
         messages.error(request,message)
 	if settings.DEBUG: