diff --git a/rowers/imports.py b/rowers/imports.py index 3aedd9db..cb1cb83f 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -201,6 +201,7 @@ def imports_get_token( code,oauth_data ): + redirect_uri = oauth_data['redirect_uri'] client_secret = oauth_data['client_secret'] client_id = oauth_data['client_id'] diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index 37d91aba..f79ec9e0 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -53,20 +53,30 @@ oauth_data = { 'scope':'read', } -def get_token(code): +def get_token(code,callbackuri): #client_id = oauth_data['client_id'] #client_secret = oauth_data['client_secret'] #base_uri = oauth_data['base_url'] - #callbackuri = 'https://'+callbackuri[9:] - #print(callbackuri) - #nk = OAuth2Session(client_id) #token = nk.fetch_token(base_uri,client_secret=client_secret,authorization_response=callbackuri) #print(token) #return [0,0,0] - return imports_get_token(code, oauth_data) + url = oauth_data['base_url'] + data = {"client_id": oauth_data['client_id'], + "grant_type": "authorization_code", + "redirect_uri": oauth_data['redirect_uri'], + "client_secret": oauth_data['client_secret'], + "code": code, +# "scope":oauth_data['scope'], + } + #url = url+'?'+urllib.parse.urlencode(params) + print(url) + response = requests.post(url,data=data) + print(response.reason) + return [0,response.text,0] + #return imports_get_token(code, oauth_data) def nk_open(user): t = time.localtime() diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 8be07e00..33f52fe3 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -777,10 +777,15 @@ def rower_process_garmincallback(request): @login_required() def rower_process_nkcallback(request): uri = request.build_absolute_uri() + uri = 'https://dunav.ngrok.io/'+uri[22:] + print(uri) + print(request.GET.get('code')) + raise ValueError + # do stuff try: code = request.GET.get('code',None) - res = nkstuff.get_token(code) + res = nkstuff.get_token(code,uri) except MultiValueDictKeyError: message = "The resource owner or authorization server denied the request" messages.error(request,message)