diff --git a/rowers/integrations/nk.py b/rowers/integrations/nk.py index 80f73df6..276d2a28 100644 --- a/rowers/integrations/nk.py +++ b/rowers/integrations/nk.py @@ -52,7 +52,7 @@ class NKIntegration(SyncIntegration): def workout_export(self, workout, *args, **kwargs) -> str: return "" # there is no export - def get_workouts(*args, **kwargs) -> int: + def get_workouts(self, *args, **kwargs) -> int: before = kwargs.get('before',0) after = kwargs.get('after',0) try: diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py deleted file mode 100644 index 1671c563..00000000 --- a/rowers/nkstuff.py +++ /dev/null @@ -1,284 +0,0 @@ -from requests.auth import HTTPBasicAuth -from rowers.nkimportutils import * -from rowers.imports import * -from rowers.tasks import handle_nk_async_workout -from rowsandall_app.settings import ( - NK_CLIENT_ID, NK_REDIRECT_URI, NK_CLIENT_SECRET, - SITE_URL, NK_API_LOCATION, NK_OAUTH_LOCATION, - UPLOAD_SERVICE_URL, UPLOAD_SERVICE_SECRET, -) -import gzip -import rowers.mytypes as mytypes -from rowers.utils import myqueue -from iso8601 import ParseError -from rowers.rower_rules import is_workout_user, ispromember - -import time -from time import strftime - -import requests - -from rowers.utils import dologging -from json.decoder import JSONDecodeError - -# https:#oauth-stage.nkrowlink.com/oauth/authorizegrant_type=authorization_code&response_type=code&client_id=rowsandall-staging&scope=read&state=fc8fc3d8-ce0a-443e-838a-1c06fb5317c6&redirect_uri=https%3A%2F%2Fdunav.ngrok.io%2Fnk_callback%2F -# https:#oauth-stage.nkrowlink.com/oauth/authorize?grant_type=authorization_code&response_type=code&client_id=rowsandall-staging&scope=read&state=1234&redirect_uri=https%3A%2F%2Fdev.rowsandall.com%2Fnk_callback - -from requests_oauthlib import OAuth2Session - -import django_rq -queue = django_rq.get_queue('default') -queuelow = django_rq.get_queue('low') -queuehigh = django_rq.get_queue('low') - -oauth_data = { - 'client_id': NK_CLIENT_ID, - 'client_secret': NK_CLIENT_SECRET, - 'redirect_uri': NK_REDIRECT_URI, - 'autorization_uri': NK_OAUTH_LOCATION+"/oauth/authorize", - 'content_type': 'application/json', - 'tokenname': 'nktoken', - 'refreshtokenname': 'nkrefreshtoken', - 'expirydatename': 'nktokenexpirydate', - 'bearer_auth': True, - 'base_url': NK_OAUTH_LOCATION+"/oauth/token", - 'scope': 'read', -} - - -def get_token(code): # pragma: no cover - url = oauth_data['base_url'] - - post_data = {"client_id": oauth_data['client_id'], - "grant_type": "authorization_code", - "redirect_uri": oauth_data['redirect_uri'], - "code": code, - } - - response = requests.post(url, auth=HTTPBasicAuth(oauth_data['client_id'], oauth_data['client_secret']), - data=post_data) - - - if response.status_code != 200: - return [0, response.text, 0, 0] - - token_json = response.json() - - access_token = token_json['access_token'] - refresh_token = token_json['refresh_token'] - expires_in = token_json['expires_in'] - nk_owner_id = token_json['user_id'] - - return [access_token, expires_in, refresh_token, nk_owner_id] - - -def nk_open(user): - r = Rower.objects.get(user=user) - - if (r.nktoken == '') or (r.nktoken is None): # pragma: no cover - raise NoTokenError("User has no token") - else: - if (timezone.now() > r.nktokenexpirydate): - - thetoken = rower_nk_token_refresh(user) - if thetoken is None: # pragma: no cover - raise NoTokenError("User has no token") - return thetoken - else: - thetoken = r.nktoken - - return thetoken - - -def get_nk_workouts(rower, do_async=True, before=0, after=0): - try: - _ = nk_open(rower.user) - except NoTokenError: # pragma: no cover - dologging("nklog.log","NK Token error for user {id}".format(id=rower.user.id)) - return 0 - - res = get_nk_workout_list(rower.user, before=before, after=after) - - if res.status_code != 200: # pragma: no cover - dologging('nklog.log','Status code {code}'.format(code=res.status_code)) - return 0 - - #dologging('nklog.log',json.dumps(res.json())) - nkids = [item['id'] for item in res.json()] - dologging('nklog.log',json.dumps(nkids)) - alldata = {} - for item in res.json(): - alldata[item['id']] = item - - knownnkids = [ - w.uploadedtonk for w in Workout.objects.filter(user=rower) - ] - - tombstones = [ - t.uploadedtonk for t in TombStone.objects.filter(user=rower) - ] - - parkedids = [] - try: - with open('nkblocked.json', 'r') as nkblocked: - jsondata = json.load(nkblocked) - parkedids = jsondata['ids'] - except (FileNotFoundError, JSONDecodeError): # pragma: no cover - pass - - knownnkids = uniqify(knownnkids+tombstones+parkedids) - newids = [nkid for nkid in nkids if nkid not in knownnkids] - newids2 = newids.copy() - dologging('nklog.log',json.dumps(newids)) - dologging('nklog.log','Nr of new IDs is {i}'.format(i=len(newids))) - #if len(newids)>0: - # s = 'Starting NK Auto Import for user {id}'.format(id=r.user.id) - # dologging('nklog.log', s) - # s = 'New NK IDs {newids} (user {id})'.format(newids=newids,id=rower.user.id) - # dologging('nklog.log', s) - #else: - # dologging('nklog.log','Newids is false') - - newparkedids = uniqify(newids+parkedids) - - with open('nkblocked.json', 'wt') as nkblocked: - data = {'ids': newparkedids} - json.dump(data, nkblocked) - - counter = 0 - #dologging('nklog.log','Ik ben hier') - for nkid in newids2: - dologging('nklog.log','Queueing {id}'.format(id=nkid)) - res = myqueue(queuehigh, - handle_nk_async_workout, - alldata, - rower.user.id, - rower.nktoken, - nkid, - counter, - rower.defaulttimezone - ) - counter += 1 - - return 1 - - -def do_refresh_token(refreshtoken): - post_data = {"grant_type": "refresh_token", - # "client_id":NK_CLIENT_ID, - "refresh_token": refreshtoken, - } - - url = oauth_data['base_url'] - - response = requests.post(url, data=post_data, auth=HTTPBasicAuth( - oauth_data['client_id'], oauth_data['client_secret'])) - - if response.status_code != 200: # pragma: no cover - return [0, 0, 0] - - token_json = response.json() - - access_token = token_json['access_token'] - refresh_token = token_json['refresh_token'] - expires_in = token_json['expires_in'] - - return access_token, expires_in, refresh_token - - -def rower_nk_token_refresh(user): - r = Rower.objects.get(user=user) - res = do_refresh_token(r.nkrefreshtoken) - access_token = res[0] - expires_in = res[1] - refresh_token = res[2] - expirydatetime = timezone.now()+timedelta(seconds=expires_in) - - r.nktoken = access_token - r.nktokenexpirydate = expirydatetime - r.nkrefreshtoken = refresh_token - r.save() - - return r.nktoken - - -def make_authorization_url(request): # pragma: no cover - return imports_make_authorization_url(oauth_data) - - -def get_nk_workout_list(user, fake=False, after=0, before=0): - r = Rower.objects.get(user=user) - - if (r.nktoken == '') or (r.nktoken is None): # pragma: no cover - s = "Token doesn't exist. Need to authorize" - return custom_exception_handler(401, s) - elif (r.nktokenexpirydate is None or - timezone.now()+timedelta(seconds=10) > r.nktokenexpirydate): # pragma: no cover - s = "Token expired. Needs to refresh." - return custom_exception_handler(401, s) - else: - # ready to fetch. Hurray - if not before: # pragma: no cover - before = arrow.now()+timedelta(days=1) - before = str(int(before.timestamp())*1000) - if not after: # pragma: no cover - after = arrow.now()-timedelta(days=7) - after = str(int(after.timestamp())*1000) - authorizationstring = str('Bearer ' + r.nktoken) - headers = {'Authorization': authorizationstring, - 'user-agent': 'sanderroosendaal', - 'Content-Type': 'application/json', - } - - url = NK_API_LOCATION+"api/v1/sessions" - - params = { - 'after': after, - 'before': before, - } # start / end time - - s = requests.get(url, headers=headers, params=params) - - return s - -# - - -def get_workout(user, nkid, do_async=True, startdate='', enddate=''): - r = Rower.objects.get(user=user) - if (r.nktoken == '') or (r.nktoken is None): # pragma: no cover - s = "Token doesn't exist. Need to authorize" - return custom_exception_handler(401, s), 0 - elif (timezone.now() > r.nktokenexpirydate): # pragma: no cover - s = "Token expired. Needs to refresh." - return custom_exception_handler(401, s), 0 - - before = 0 - after = 0 - if startdate: # pragma: no cover - startdate = arrow.get(startdate) - after = str(int(startdate.timestamp())*1000) - if enddate: # pragma: no cover - enddate = arrow.get(enddate) - before = str(int(enddate.timestamp())*1000) - - res = get_nk_workout_list(r.user, before=before, after=after) - if res.status_code != 200: # pragma: no cover - # dologging('nklog.log','Status code {code}'.format(code=res.status_code)) - return 0 - alldata = {} - for item in res.json(): - alldata[item['id']] = item - - res = myqueue( - queuehigh, - handle_nk_async_workout, - alldata, - r.user.id, - r.nktoken, - nkid, - 0, - r.defaulttimezone, - ) - - return res diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 8a8e14fa..101aac3a 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ