diff --git a/esap/esap/esap_accounts_config.sqlite3 b/esap/esap/esap_accounts_config.sqlite3 index ab97d137d2e19bb2b8c9461ffef18d1a2995c202..129e05fdd3d934d7da04d378bbf42f197bb2213c 100644 Binary files a/esap/esap/esap_accounts_config.sqlite3 and b/esap/esap/esap_accounts_config.sqlite3 differ diff --git a/esap/esap/esap_config.sqlite3 b/esap/esap/esap_config.sqlite3 index d9085e0cf463e1a8ec9cfab1608956be2fc490d0..539aef0c9e2aebc8c65c104015336dfa36676472 100644 Binary files a/esap/esap/esap_config.sqlite3 and b/esap/esap/esap_config.sqlite3 differ diff --git a/esap/esap/settings/base.py b/esap/esap/settings/base.py index 5b20cb6d177ea87e6c01031f0bea3a13fe258422..227e46905bb4e088f5de4a9fecfd4a2d6647b9a1 100644 --- a/esap/esap/settings/base.py +++ b/esap/esap/settings/base.py @@ -41,8 +41,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'rest_framework', 'corsheaders', - 'django_filters', - 'django_scim' + 'django_filters' ] #DATABASES = { @@ -64,8 +63,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'mozilla_django_oidc.middleware.SessionRefresh', 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django_scim.middleware.SCIMAuthCheckMiddleware' + 'django.middleware.clickjacking.XFrameOptionsMiddleware' ] @@ -248,18 +246,6 @@ except: 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! # preferably read the SECRET_KEY from the environment try: diff --git a/esap/esap/urls.py b/esap/esap/urls.py index 25b0242674003a21933d653a80f11655ac58471b..7c498e3dab84234f42228674f4649311a4cfa499 100644 --- a/esap/esap/urls.py +++ b/esap/esap/urls.py @@ -23,5 +23,4 @@ urlpatterns = [ path('esap-api/ida/', include('ida.api.urls')), path('esap-api/admin/', admin.site.urls, name='admin-view'), re_path('^esap-api/oidc/', include('mozilla_django_oidc.urls')), - path('scim/v2/', include('django_scim.urls')), ] diff --git a/esap/requirements/base.txt b/esap/requirements/base.txt index afbfc6dc53983849bb1c5400593e033b85b958d0..241b62d20ffec7f2d2c9335194596aca13e179d0 100644 --- a/esap/requirements/base.txt +++ b/esap/requirements/base.txt @@ -1,6 +1,9 @@ :::::::::::::: requirements/base.txt :::::::::::::: +:::::::::::::: +requirements/base.txt +:::::::::::::: #cython==0.29.14 #cryptography Django==3.1.4 @@ -16,4 +19,3 @@ django-rest-knox==4.1.0 mozilla-django-oidc==1.2.4 panoptes-client==1.2.0 eossr==0.2 -django-scim2