Skip to content
Snippets Groups Projects
Commit 4c7c06f7 authored by Gareth Hughes's avatar Gareth Hughes
Browse files

Merge branch '69_add_diracIAM' of...

Merge branch '69_add_diracIAM' of https://git.astron.nl/astron-sdc/esap-api-gateway into 69_add_diracIAM
paring the output
parents b1361868 706ee73d
Branches
Tags
No related merge requests found
No preview for this file type
No preview for this file type
...@@ -41,8 +41,7 @@ INSTALLED_APPS = [ ...@@ -41,8 +41,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'rest_framework', 'rest_framework',
'corsheaders', 'corsheaders',
'django_filters', 'django_filters'
'django_scim'
] ]
#DATABASES = { #DATABASES = {
...@@ -64,8 +63,7 @@ MIDDLEWARE = [ ...@@ -64,8 +63,7 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'mozilla_django_oidc.middleware.SessionRefresh', 'mozilla_django_oidc.middleware.SessionRefresh',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware'
'django_scim.middleware.SCIMAuthCheckMiddleware'
] ]
...@@ -248,18 +246,6 @@ except: ...@@ -248,18 +246,6 @@ except:
OIDC_RENEW_ID_TOKEN_EXPIRY_SECONDS = 36000 OIDC_RENEW_ID_TOKEN_EXPIRY_SECONDS = 36000
# SCIM Settings
SCIM_SERVICE_PROVIDER = {
'NETLOC': 'localhost',
'AUTHENTICATION_SCHEMES': [
{
'type': 'oauth2',
'name': 'OAuth 2',
'description': 'Oauth 2 implemented with bearer token',
},
],
}
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
# preferably read the SECRET_KEY from the environment # preferably read the SECRET_KEY from the environment
try: try:
......
...@@ -23,5 +23,4 @@ urlpatterns = [ ...@@ -23,5 +23,4 @@ urlpatterns = [
path('esap-api/ida/', include('ida.api.urls')), path('esap-api/ida/', include('ida.api.urls')),
path('esap-api/admin/', admin.site.urls, name='admin-view'), path('esap-api/admin/', admin.site.urls, name='admin-view'),
re_path('^esap-api/oidc/', include('mozilla_django_oidc.urls')), re_path('^esap-api/oidc/', include('mozilla_django_oidc.urls')),
path('scim/v2/', include('django_scim.urls')),
] ]
:::::::::::::: ::::::::::::::
requirements/base.txt requirements/base.txt
:::::::::::::: ::::::::::::::
::::::::::::::
requirements/base.txt
::::::::::::::
#cython==0.29.14 #cython==0.29.14
#cryptography #cryptography
Django==3.1.4 Django==3.1.4
...@@ -16,4 +19,3 @@ django-rest-knox==4.1.0 ...@@ -16,4 +19,3 @@ django-rest-knox==4.1.0
mozilla-django-oidc==1.2.4 mozilla-django-oidc==1.2.4
panoptes-client==1.2.0 panoptes-client==1.2.0
eossr==0.2 eossr==0.2
django-scim2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment