sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixed unicode response

Browse Source
This commit is contained in:
Sander Roosendaal
2018-05-11 09:35:47 +02:00
parent 34135c7e9b
commit 9969fb8d29
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/sporttracksstuff.py
View File

@@ -102,6 +102,11 @@ def do_refresh_token(refreshtoken):
refresh_token = token_json['refresh_token'] refresh_token = token_json['refresh_token']
except KeyError: except KeyError:
refresh_token = refreshtoken refresh_token = refreshtoken
try:
expires_in = int(expires_in)
except (TypeError,ValueError):
expires_in = 0
return [thetoken,expires_in,refresh_token] return [thetoken,expires_in,refresh_token]
@@ -131,6 +136,10 @@ def get_token(code):
refresh_token = token_json['refresh_token'] refresh_token = token_json['refresh_token']
except KeyError: except KeyError:
refresh_token = refreshtoken refresh_token = refreshtoken
try:
expires_in = int(expires_in)
except (ValueError,TypeError):
expires_in = 0
else: else:
return [0,0,0] return [0,0,0]

3
rowers/views.py
View File

@@ -2662,6 +2662,7 @@ def rower_process_sporttrackscallback(request):
access_token = res[0] access_token = res[0]
expires_in = res[1] expires_in = res[1]
refresh_token = res[2] refresh_token = res[2]
expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in) expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
r = getrower(request.user) r = getrower(request.user)
@@ -9597,6 +9598,8 @@ def workout_sporttracksimport_view(request,message=""):
if (r.sporttrackstoken == '') or (r.sporttrackstoken is None): if (r.sporttrackstoken == '') or (r.sporttrackstoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return HttpResponseRedirect("/rowers/me/sporttracksauthorize/") return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")
else:
return HttpResponseRedirect("/rowers/me/sporttracksrefresh/")
message = "Something went wrong in workout_sporttracksimport_view" message = "Something went wrong in workout_sporttracksimport_view"
messages.error(request,message) messages.error(request,message)
if settings.DEBUG: if settings.DEBUG: