commit
This commit is contained in:
@@ -1,4 +1,18 @@
|
||||
from __future__ import absolute_import
|
||||
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
|
||||
from __future__ import division
|
||||
from __future__ import print_function
|
||||
from __future__ import unicode_literals
|
||||
@@ -12,8 +26,8 @@ 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
|
||||
# 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
|
||||
|
||||
@@ -22,30 +36,12 @@ queue = django_rq.get_queue('default')
|
||||
queuelow = django_rq.get_queue('low')
|
||||
queuehigh = django_rq.get_queue('low')
|
||||
|
||||
from rowers.rower_rules import is_workout_user, ispromember
|
||||
|
||||
from iso8601 import ParseError
|
||||
from rowers.utils import myqueue
|
||||
|
||||
import rowers.mytypes as mytypes
|
||||
import gzip
|
||||
|
||||
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,
|
||||
)
|
||||
|
||||
from rowers.tasks import handle_nk_async_workout
|
||||
|
||||
|
||||
try:
|
||||
from json.decoder import JSONDecodeError
|
||||
except ImportError: # pragma: no cover
|
||||
except ImportError: # pragma: no cover
|
||||
JSONDecodeError = ValueError
|
||||
|
||||
from rowers.imports import *
|
||||
from rowers.nkimportutils import *
|
||||
|
||||
oauth_data = {
|
||||
'client_id': NK_CLIENT_ID,
|
||||
@@ -58,34 +54,30 @@ oauth_data = {
|
||||
'expirydatename': 'nktokenexpirydate',
|
||||
'bearer_auth': True,
|
||||
'base_url': NK_OAUTH_LOCATION+"/oauth/token",
|
||||
'scope':'read',
|
||||
}
|
||||
'scope': 'read',
|
||||
}
|
||||
|
||||
from requests.auth import HTTPBasicAuth
|
||||
|
||||
def get_token(code): # pragma: no cover
|
||||
def get_token(code): # pragma: no cover
|
||||
url = oauth_data['base_url']
|
||||
|
||||
|
||||
headers = {'Accept': 'application/json',
|
||||
#'Authorization': auth_header,
|
||||
# 'Authorization': auth_header,
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
#'user-agent': 'sanderroosendaal'
|
||||
# 'user-agent': 'sanderroosendaal'
|
||||
}
|
||||
|
||||
|
||||
|
||||
post_data = {"client_id": oauth_data['client_id'],
|
||||
"grant_type": "authorization_code",
|
||||
"redirect_uri": oauth_data['redirect_uri'],
|
||||
"code": code,
|
||||
}
|
||||
"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']),
|
||||
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]
|
||||
return [0, response.text, 0, 0]
|
||||
|
||||
token_json = response.json()
|
||||
|
||||
@@ -94,20 +86,20 @@ def get_token(code): # pragma: no cover
|
||||
expires_in = token_json['expires_in']
|
||||
nk_owner_id = token_json['user_id']
|
||||
|
||||
return [access_token, expires_in, refresh_token,nk_owner_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
|
||||
if (r.nktoken == '') or (r.nktoken is None): # pragma: no cover
|
||||
s = "Token doesn't exist. Need to authorize"
|
||||
raise NoTokenError("User has no token")
|
||||
else:
|
||||
if (timezone.now()>r.nktokenexpirydate):
|
||||
if (timezone.now() > r.nktokenexpirydate):
|
||||
|
||||
thetoken = rower_nk_token_refresh(user)
|
||||
if thetoken == None: # pragma: no cover
|
||||
if thetoken == None: # pragma: no cover
|
||||
raise NoTokenError("User has no token")
|
||||
return thetoken
|
||||
else:
|
||||
@@ -115,15 +107,16 @@ def nk_open(user):
|
||||
|
||||
return thetoken
|
||||
|
||||
def get_nk_workouts(rower, do_async=True,before=0,after=0):
|
||||
|
||||
def get_nk_workouts(rower, do_async=True, before=0, after=0):
|
||||
try:
|
||||
thetoken = nk_open(rower.user)
|
||||
except NoTokenError: # pragma: no cover
|
||||
except NoTokenError: # pragma: no cover
|
||||
return 0
|
||||
|
||||
res = get_nk_workout_list(rower.user,before=before,after=after)
|
||||
res = get_nk_workout_list(rower.user, before=before, after=after)
|
||||
|
||||
if res.status_code != 200: # pragma: no cover
|
||||
if res.status_code != 200: # pragma: no cover
|
||||
return 0
|
||||
|
||||
nkids = [item['id'] for item in res.json()]
|
||||
@@ -141,22 +134,22 @@ def get_nk_workouts(rower, do_async=True,before=0,after=0):
|
||||
|
||||
parkedids = []
|
||||
try:
|
||||
with open('nkblocked.json','r') as nkblocked:
|
||||
with open('nkblocked.json', 'r') as nkblocked:
|
||||
jsondata = json.load(nkblocked)
|
||||
parkedids = jsondata['ids']
|
||||
except (FileNotFoundError,JSONDecodeError): # pragma: no cover
|
||||
except (FileNotFoundError, JSONDecodeError): # pragma: no cover
|
||||
pass
|
||||
|
||||
knownnkids = uniqify(knownnkids+tombstones+parkedids)
|
||||
newids = [nkid for nkid in nkids if not nkid in knownnkids]
|
||||
s = 'New NK IDs {newids}'.format(newids=newids)
|
||||
dologging('nklog.log',s)
|
||||
dologging('nklog.log', s)
|
||||
|
||||
newparkedids = uniqify(newids+parkedids)
|
||||
|
||||
with open('nkblocked.json','wt') as nkblocked:
|
||||
data = {'ids':newparkedids}
|
||||
json.dump(data,nkblocked)
|
||||
with open('nkblocked.json', 'wt') as nkblocked:
|
||||
data = {'ids': newparkedids}
|
||||
json.dump(data, nkblocked)
|
||||
|
||||
counter = 0
|
||||
for nkid in newids:
|
||||
@@ -174,19 +167,19 @@ def get_nk_workouts(rower, do_async=True,before=0,after=0):
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
def do_refresh_token(refreshtoken):
|
||||
post_data = {"grant_type": "refresh_token",
|
||||
#"client_id":NK_CLIENT_ID,
|
||||
# "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']))
|
||||
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]
|
||||
if response.status_code != 200: # pragma: no cover
|
||||
return [0, 0, 0]
|
||||
|
||||
token_json = response.json()
|
||||
|
||||
@@ -212,24 +205,26 @@ def rower_nk_token_refresh(user):
|
||||
|
||||
return r.nktoken
|
||||
|
||||
def make_authorization_url(request): # pragma: no cover
|
||||
|
||||
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):
|
||||
|
||||
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
|
||||
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
|
||||
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)
|
||||
return custom_exception_handler(401, s)
|
||||
else:
|
||||
# ready to fetch. Hurray
|
||||
if not before: # pragma: no cover
|
||||
if not before: # pragma: no cover
|
||||
before = arrow.now()+timedelta(days=1)
|
||||
before = str(int(before.timestamp())*1000)
|
||||
if not after: # pragma: no cover
|
||||
if not after: # pragma: no cover
|
||||
after = arrow.now()-timedelta(days=7)
|
||||
after = str(int(after.timestamp())*1000)
|
||||
authorizationstring = str('Bearer ' + r.nktoken)
|
||||
@@ -241,25 +236,25 @@ def get_nk_workout_list(user,fake=False,after=0,before=0):
|
||||
url = NK_API_LOCATION+"api/v1/sessions"
|
||||
|
||||
params = {
|
||||
'after':after,
|
||||
'before':before,
|
||||
} # start / end time
|
||||
|
||||
s = requests.get(url,headers=headers,params=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=''):
|
||||
|
||||
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
|
||||
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
|
||||
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
|
||||
return custom_exception_handler(401, s), 0
|
||||
|
||||
params = {
|
||||
'sessionIds': nkid,
|
||||
@@ -267,15 +262,15 @@ def get_workout(user,nkid,do_async=True,startdate='',enddate=''):
|
||||
|
||||
before = 0
|
||||
after = 0
|
||||
if startdate: # pragma: no cover
|
||||
if startdate: # pragma: no cover
|
||||
startdate = arrow.get(startdate)
|
||||
after = str(int(startdate.timestamp())*1000)
|
||||
if enddate: # pragma: no cover
|
||||
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
|
||||
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 = {}
|
||||
@@ -291,6 +286,6 @@ def get_workout(user,nkid,do_async=True,startdate='',enddate=''):
|
||||
nkid,
|
||||
0,
|
||||
r.defaulttimezone,
|
||||
)
|
||||
)
|
||||
|
||||
return res
|
||||
|
||||
Reference in New Issue
Block a user