sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v13.63'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-18 17:17:35 +02:00
parent 4900760a12 0f19a5d077
commit 1fd8820a06
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,7 +1,7 @@
# cache # cache
/django_cache/ /django_cache/
testcert.crt *.crt
testcert.key *.key
garminlog.log garminlog.log
strava_webhooks.log strava_webhooks.log

1
rowers/serializers.py
View File

@@ -78,6 +78,7 @@ class StandardCollectionSerializer(serializers.ModelSerializer):
model = StandardCollection model = StandardCollection
fields = ( fields = (
'id', 'id',
'name',
'notes', 'notes',
'active', 'active',
'standards' 'standards'

13
rowsandall_app/settings.py
View File

@@ -42,9 +42,10 @@ TESTING = False
ALLOWED_HOSTS = CFG['allowed_hosts'] ALLOWED_HOSTS = CFG['allowed_hosts']
OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken' #OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken'
OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application' #OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application'
OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken' #OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken'
#OAUTH2_PROVIDER_ACCESS_TOKEN_EXPIRE_SECONDS = 3600
# Application definition # Application definition
@@ -411,7 +412,11 @@ OAUTH2_PROVIDER = {
'SCOPES': {'read': 'Read scope', 'write': 'Write scope', 'groups': 'Access to your groups'}, 'SCOPES': {'read': 'Read scope', 'write': 'Write scope', 'groups': 'Access to your groups'},
'ALLOWED_REDIRECT_URI_SCHEMES': ["http", 'ALLOWED_REDIRECT_URI_SCHEMES': ["http",
"https", "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' # 'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore'
} }