Merge branch 'release/v13.47'

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)
@@ -159,8 +160,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']
 

rowers/views/importviews.py

@@ -764,6 +764,7 @@ def rower_process_stravacallback(request):
         r.stravarefreshtoken = refresh_token
 
         r.save()
+        id = stravastuff.set_strava_athlete_id(r.user)
 
         successmessage = "Tokens stored. Good to go"
         messages.info(request,successmessage)