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

Merge tag 'v2.5' into develop

Browse Source 
trainingpeaks, watermark, upload page
This commit is contained in:
Sander Roosendaal
2017-05-09 21:21:59 +02:00
parent f86e303efd 1f594aa4cf
commit 5857c13330
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/tpstuff.py
View File

@@ -8,6 +8,7 @@ import requests.auth
import json import json
from django.utils import timezone from django.utils import timezone
from datetime import datetime from datetime import datetime
from datetime import timedelta
import numpy as np import numpy as np
from dateutil import parser from dateutil import parser
import time import time
@@ -101,11 +102,11 @@ def tp_open(user):
raise TPNoTokenError("User has no token") raise TPNoTokenError("User has no token")
else: else:
if (timezone.now()>r.tptokenexpirydate): if (timezone.now()>r.tptokenexpirydate):
res = tpstuff.do_refresh_token(r.tprefreshtoken) res = do_refresh_token(r.tprefreshtoken)
if res[0] != 0: if res[0] != 0:
r.tptoken = res[0] r.tptoken = res[0]
r.tprefreshtoken = res[2] r.tprefreshtoken = res[2]
expirydatetime = timezone.now()+datetime.timedelta(seconds=res[1]) expirydatetime = timezone.now()+timedelta(seconds=res[1])
r.tptokenexpirydate = expirydatetime r.tptokenexpirydate = expirydatetime
r.save() r.save()
thetoken = r.tptoken thetoken = r.tptoken