Merge branch 'release/v18.10.3'
This commit is contained in:
@@ -21,6 +21,7 @@ from datetime import timedelta
|
|||||||
|
|
||||||
graphql_url = "https://rp3rowing-app.com/graphql"
|
graphql_url = "https://rp3rowing-app.com/graphql"
|
||||||
|
|
||||||
|
import urllib
|
||||||
|
|
||||||
class RP3Integration(SyncIntegration):
|
class RP3Integration(SyncIntegration):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class SportTracksIntegration(SyncIntegration):
|
|||||||
'client_id': SPORTTRACKS_CLIENT_ID,
|
'client_id': SPORTTRACKS_CLIENT_ID,
|
||||||
'client_secret': SPORTTRACKS_CLIENT_SECRET,
|
'client_secret': SPORTTRACKS_CLIENT_SECRET,
|
||||||
'redirect_uri': SPORTTRACKS_REDIRECT_URI,
|
'redirect_uri': SPORTTRACKS_REDIRECT_URI,
|
||||||
'authorization_uri': "https://api.sporttracks.mobi/oauth2/authorize",
|
'authorization_uri': "https://api.sporttracks.mobi/oauth2/authorize?",
|
||||||
'content_type': 'application/json',
|
'content_type': 'application/json',
|
||||||
'tokenname': 'sporttrackstoken',
|
'tokenname': 'sporttrackstoken',
|
||||||
'refreshtokenname': 'sporttracksrefreshtoken',
|
'refreshtokenname': 'sporttracksrefreshtoken',
|
||||||
|
|||||||
@@ -736,9 +736,6 @@ urlpatterns = [
|
|||||||
views.rower_prefs_view, name='rower_prefs_view'),
|
views.rower_prefs_view, name='rower_prefs_view'),
|
||||||
re_path(r'^me/prefs/user/(?P<userid>\d+)/$',
|
re_path(r'^me/prefs/user/(?P<userid>\d+)/$',
|
||||||
views.rower_simpleprefs_view, name='rower_simpleprefs_view'),
|
views.rower_simpleprefs_view, name='rower_simpleprefs_view'),
|
||||||
re_path(r'^me/edit/(.+.*)/$', views.rower_edit_view, name='rower_edit_view'),
|
|
||||||
re_path(r'^me/(?P<source>\w+.*)authorize', views.rower_integration_authorize,
|
|
||||||
name='rower_integration_authorize'),
|
|
||||||
re_path(r'^me/rojaboauthorize/$', views.rower_rojabo_authorize,
|
re_path(r'^me/rojaboauthorize/$', views.rower_rojabo_authorize,
|
||||||
name='rower_rojabo_authorize'),
|
name='rower_rojabo_authorize'),
|
||||||
re_path(r'^me/polarauthorize/$', views.rower_polar_authorize,
|
re_path(r'^me/polarauthorize/$', views.rower_polar_authorize,
|
||||||
@@ -747,6 +744,9 @@ urlpatterns = [
|
|||||||
views.rower_revokeapp_view, name='rower_revokeapp_view'),
|
views.rower_revokeapp_view, name='rower_revokeapp_view'),
|
||||||
re_path(r'^me/garminauthorize/$', views.rower_garmin_authorize,
|
re_path(r'^me/garminauthorize/$', views.rower_garmin_authorize,
|
||||||
name='rower_garmin_authorize'),
|
name='rower_garmin_authorize'),
|
||||||
|
re_path(r'^me/edit/(.+.*)/$', views.rower_edit_view, name='rower_edit_view'),
|
||||||
|
re_path(r'^me/(?P<source>\w+.*)authorize', views.rower_integration_authorize,
|
||||||
|
name='rower_integration_authorize'),
|
||||||
re_path(r'^me/(?P<source>\w+.*)refresh/$', views.rower_integration_token_refresh,
|
re_path(r'^me/(?P<source>\w+.*)refresh/$', views.rower_integration_token_refresh,
|
||||||
name='rower_integration_token_refresh'),
|
name='rower_integration_token_refresh'),
|
||||||
re_path(r'^me/favoritecharts/$', views.rower_favoritecharts_view,
|
re_path(r'^me/favoritecharts/$', views.rower_favoritecharts_view,
|
||||||
|
|||||||
Reference in New Issue
Block a user