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

some better parameterization of NK LinK

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-29 15:40:12 +02:00
parent 2e1f422827
commit 9746b9925f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/nkstuff.py
View File

@@ -29,7 +29,7 @@ import gzip
from rowsandall_app.settings import ( from rowsandall_app.settings import (
NK_CLIENT_ID, NK_REDIRECT_URI, NK_CLIENT_SECRET, NK_CLIENT_ID, NK_REDIRECT_URI, NK_CLIENT_SECRET,
SITE_URL, NK_API_LOCATION, SITE_URL, NK_API_LOCATION,NK_OAUTH_LOCATION,
UPLOAD_SERVICE_URL, UPLOAD_SERVICE_SECRET, UPLOAD_SERVICE_URL, UPLOAD_SERVICE_SECRET,
) )
@@ -48,13 +48,13 @@ oauth_data = {
'client_id': NK_CLIENT_ID, 'client_id': NK_CLIENT_ID,
'client_secret': NK_CLIENT_SECRET, 'client_secret': NK_CLIENT_SECRET,
'redirect_uri': NK_REDIRECT_URI, 'redirect_uri': NK_REDIRECT_URI,
'autorization_uri': "https://oauth-stage.nkrowlink.com/oauth/authorize", 'autorization_uri': NK_OAUTH_LOCATION+"/oauth/authorize",
'content_type': 'application/json', 'content_type': 'application/json',
'tokenname': 'nktoken', 'tokenname': 'nktoken',
'refreshtokenname': 'nkrefreshtoken', 'refreshtokenname': 'nkrefreshtoken',
'expirydatename': 'nktokenexpirydate', 'expirydatename': 'nktokenexpirydate',
'bearer_auth': True, 'bearer_auth': True,
'base_url': "https://oauth-stage.nkrowlink.com/oauth/token", 'base_url': NK_OAUTH_LOCATION+"/oauth/token",
'scope':'read', 'scope':'read',
} }

3
rowers/views/importviews.py
View File

@@ -11,6 +11,7 @@ def default(o): # pragma: no cover
if isinstance(o, numpy.int64): return int(o) if isinstance(o, numpy.int64): return int(o)
raise TypeError raise TypeError
from rowsandall_app.settings import NK_OAUTH_LOCATION
# Send workout to TP # Send workout to TP
@permission_required('workout.change_workout',fn=get_workout_by_opaqueid,raise_exception=True) @permission_required('workout.change_workout',fn=get_workout_by_opaqueid,raise_exception=True)
@@ -407,7 +408,7 @@ def rower_nk_authorize(request): # pragma: no cover
"redirect_uri": NK_REDIRECT_URI, "redirect_uri": NK_REDIRECT_URI,
} }
url = "https://oauth-stage.nkrowlink.com/oauth/authorize?"+urllib.parse.urlencode(params) url = NK_OAUTH_LOCATION+"/oauth/authorize?"+urllib.parse.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)

1
rowsandall_app/settings.py
View File

@@ -333,6 +333,7 @@ NK_CLIENT_ID = CFG["nk_client_id"]
NK_CLIENT_SECRET = CFG["nk_client_secret"] NK_CLIENT_SECRET = CFG["nk_client_secret"]
NK_REDIRECT_URI = CFG["nk_redirect_uri"] NK_REDIRECT_URI = CFG["nk_redirect_uri"]
NK_API_LOCATION = CFG["nk_api_location"] NK_API_LOCATION = CFG["nk_api_location"]
NK_OAUTH_LOCATION = CFG["nk_oauth_location"]
NK_VIEWER_LOCATION = CFG["nk_viewer_location"] NK_VIEWER_LOCATION = CFG["nk_viewer_location"]
# Full Site URL # Full Site URL