From 69b636eb812adb897b5b83878fa01988bc0beab6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 15 Jul 2020 22:00:36 +0200 Subject: [PATCH 1/3] improvements on strava --- rowers/stravastuff.py | 3 ++- rowers/views/importviews.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index c06cbdef..aab610d9 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -75,9 +75,10 @@ def get_token(code): return imports_get_token(code, oauth_data) def strava_open(user): + token = imports_open(user, oauth_data) if user.rower.strava_owner_id == 0: strava_owner_id = set_strava_athlete_id(user) - return imports_open(user, oauth_data) + return token def do_refresh_token(refreshtoken): return imports_do_refresh_token(refreshtoken, oauth_data) diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 300e2c66..33d3a057 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -764,6 +764,7 @@ def rower_process_stravacallback(request): r.stravarefreshtoken = refresh_token r.save() + id = set_strava_athlete_id(r.user) successmessage = "Tokens stored. Good to go" messages.info(request,successmessage) From 9dadfb2edae30e2a38ccd811ce43dca14339a3e8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 15 Jul 2020 22:02:09 +0200 Subject: [PATCH 2/3] fixes --- rowers/stravastuff.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index c06cbdef..e396b04f 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -159,8 +159,11 @@ def set_strava_athlete_id(user): response = requests.get(url,headers=headers,params={}) - r.strava_owner_id = response.json()['id'] - r.save() + if response.status_code == 200: + r.strava_owner_id = response.json()['id'] + r.save() + else: + print(response.body) return response.json()['id'] From b4d18057f16d7318b69c440d26f979ebacfdf9e0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 15 Jul 2020 22:06:39 +0200 Subject: [PATCH 3/3] fixes --- rowers/views/importviews.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 33d3a057..ef6e402c 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -764,7 +764,7 @@ def rower_process_stravacallback(request): r.stravarefreshtoken = refresh_token r.save() - id = set_strava_athlete_id(r.user) + id = stravastuff.set_strava_athlete_id(r.user) successmessage = "Tokens stored. Good to go" messages.info(request,successmessage)