diff --git a/.gitignore b/.gitignore index 52e2a00e..f808e834 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # cache /django_cache/ -testcert.crt -testcert.key +*.crt +*.key garminlog.log strava_webhooks.log diff --git a/rowers/serializers.py b/rowers/serializers.py index 5df1b5f2..a5c9a8d3 100644 --- a/rowers/serializers.py +++ b/rowers/serializers.py @@ -78,6 +78,7 @@ class StandardCollectionSerializer(serializers.ModelSerializer): model = StandardCollection fields = ( 'id', + 'name', 'notes', 'active', 'standards' diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 503f7a24..b1d023ad 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -42,9 +42,10 @@ TESTING = False ALLOWED_HOSTS = CFG['allowed_hosts'] -OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken' -OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application' -OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken' +#OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken' +#OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application' +#OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken' +#OAUTH2_PROVIDER_ACCESS_TOKEN_EXPIRE_SECONDS = 3600 # Application definition @@ -411,7 +412,11 @@ OAUTH2_PROVIDER = { 'SCOPES': {'read': 'Read scope', 'write': 'Write scope', 'groups': 'Access to your groups'}, 'ALLOWED_REDIRECT_URI_SCHEMES': ["http", "https", - "rowingcoachexport"] + "rowingcoachexport"], + 'ACCESS_TOKEN_MODEL': 'oauth2_provider.AccessToken', + 'APPLICATION_MODEL': 'oauth2_provider.Application', + 'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken', + 'ACCESS_TOKEN_EXPIRE_SECONDS': 3600, # 'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore' }