From 706ee73d4e042265940b3d34e601aed13be67b25 Mon Sep 17 00:00:00 2001
From: gaughes1066 <gareth.hughes@cta-observatory.org>
Date: Mon, 1 Nov 2021 14:00:31 +0100
Subject: [PATCH] remove scim module

---
 esap/esap/esap_accounts_config.sqlite3 | Bin 86016 -> 86016 bytes
 esap/esap/esap_config.sqlite3          | Bin 229376 -> 229376 bytes
 esap/esap/settings/base.py             |  18 ++----------------
 esap/esap/urls.py                      |   1 -
 esap/requirements/base.txt             |   4 +++-
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/esap/esap/esap_accounts_config.sqlite3 b/esap/esap/esap_accounts_config.sqlite3
index ab97d137d2e19bb2b8c9461ffef18d1a2995c202..129e05fdd3d934d7da04d378bbf42f197bb2213c 100644
GIT binary patch
delta 1703
zcmZozz}m2Yb%Hb_|3n#QM*fWnOXArWIZrWgp4u!ZaDcPE$C!~vTHU|VxF@hP(U>7U
zqclAuwb(teD77R*!2`@m2XpiwG7iZliMsho#i>PQi6!|(m3sL_=@}&@1;tkS`k9Hj
zx~av<i3O>8$vOF@DSF9yiD`P7d1-linI-zA#i>P^d1?7p#s)?Psj0>$x@L)q_2#-J
zDXFHqmc~X&x&{`;M#csy#wp3>hN+caMTy~onf{qxmB~h~6`q;pnUUcYd7fGMnV~tp
zm3|?SnQ4J~sg+(;DdC=({+XUtzAm2SQQ@Ige$EC)k>Re!J|RKbQ6Zrv{vp1Vk(mbN
z{w}_izEw`yzD7Y=epRlSKF(f6_2_maM)*~M>`3$oGD!CDHH&bzO!hI#$w&$|%t<!#
z%Sd()EsZp)C`$<sER8fW&4|i0ElA3ZD)q_DF^F)s02x}IoEw%K72#DG6&{q965*GV
zoNJnq6dnrlOJ1T!SYD!gSQW@WNyc9Fd6D6!1<6Kk28rR8r4dGOg)qxN29_onnPx==
zdzyJ>hlNHO=6Hs<7x+izhMD?h1-bf1q_{?fmJ}r#1{nqA<amUI<m84JhZ%t^NHMC&
zimEg<ii!Y-P=!yHBgnjr6iC2k`-jv!<@$w(nnYz9=K5Co8u)|+W%;>8mPCelW%xQ9
zX8Tp;WJTqAmiuLSW%{{zLNrGN<wqC?6@Yz|<!a<x6>98P<!I>d5?Jhs@To^+gjY_A
zdwO~>l8>VzGRi%(@+<tZd=34ok}G`cL(&a=oV^MnBLXx1F$^m(NCf#h*DEK=CA-4c
zDAd>|#J9>n+_S{bCA2as*ucc!CD6bp#MRg@+%E$huP#wpzL}oIp1ENqk>NSTps0*8
za;uDr2+H@#%`l8I%E(DJaLP(?cP&XW@~WzjitsXuj0h@A&dV-MGWN>z%rnsQuyD+E
zNp&*{OUy`jG%<F{$u#iQbulyxE6Z~a4EC(>$#==g_l$QlNUAhWH4gXpHM5MUFf1%G
z2)8izuPjfD_pWp_&~<T3buBXUGfHtTi}ZIYNiQ@hbx*GJ%MHkgkEk@SsH!yb$uFxf
zjtKPi%k$66C=4zLEloFd&&bJ4a&ieODX~ZkHY&_<F$*-vNOO$v$c}LFGxP{f2{cU#
zGI94cFG)-^^NuJdKA#vTx%=h$<VEEqXL_1>X1SL7I(rt^d*=BWMuG)=%YCz)a-u>&
zsURvNG9<ag&pjx|FWA7;x5_KiC&bajx5~51*FCT*%H7x4Hy9MiZiZ3Lo@SnTUWSoI
zIc1<Emz3+3ixk7<evk;RiZrq;2PffN%krpj(}E~xr<|m4xB7x4XQ%SyT+7_V@QNIe
z0aVC<IjJ6wNU15X0+KXyGE$s9&3r>5tNcQejeT80P5hke%QF-6f(k&%Br-S9&@U^w
z+}9|u#4p#iJTlY3z&9)1)F&h-!_URHBr3!$$2UB%!apP<D=IfA1LW99ql$v4a8rW_
zqnvDz8Bs3T<xyE-IsWdEB~e+vprXhivMSKXC)~9%GQ_bY$|cz}(kLp^*CnztGApps
zvp&y2FDNfGD$>=(!r3$>z{$_i)k4>!D8nyYx6&i3!ZXY~*gQO=G|R8pz%et?%rrkW
zyWB86(yJge-Yd%Azre*OIM+4Dz$L;xDc!I*GB=_!HQ6n-BqKG+Fe}Z)Ff*mtqAJU&
zFxWG!Jj*XNC(tt|%vjg3$RfnVu_(Pb*C!?1E7>GDFR;qgEX2~(GcPSTt+LE4z}Y-8
zHNG?>DZ|v*%|9SN%sb1o%+fQ{)5yTcP}k5<*T7K0(Adhv*vi0^i-CcGk^d_L|JTie
z2Cw<KxR|9mA=Sv{|N4vulL}ba82SG&@c-E?Xz-q&gMop8nVEr;YcpfQfB8)Xi~^e(
IKm3me08KYN#{d8T

delta 36
qcmZozz}m2Yb%Hb_(?l6(My8DkOX4@P9QY%@$$>=y#L!=Kp#cEt>JB^r

diff --git a/esap/esap/esap_config.sqlite3 b/esap/esap/esap_config.sqlite3
index d9085e0cf463e1a8ec9cfab1608956be2fc490d0..539aef0c9e2aebc8c65c104015336dfa36676472 100644
GIT binary patch
delta 2518
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

delta 213
zcmZo@;A?2$n;^|-KT*b+(SBpXB6+bD3>^H*%=|C;OZg-D_w#r2&*Hb|SKcgGz|B8d
zS-)JBhmTpFGqJQJBfhjawTS-;gE$A6SCCqin^|0(nV-kNz_5A0zN-NnBY!vpfB0s>
z0$={g;rVMh82P_5@PB7u-z?bhn!ovbef#%%#_iwhnRpd=82OwS_?#Ft85kJUH!CU_
z@o_X;GqU=&u{utFaGptFd)7Lp>4KaL3=E9?cNqBZY!+;|#6SJcc_s}uM*c?({Es#Z
OHr(Lf{^&lF+yVe8+(DWE

diff --git a/esap/esap/settings/base.py b/esap/esap/settings/base.py
index 5b20cb6d..227e4690 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 25b02426..7c498e3d 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 afbfc6dc..241b62d2 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
-- 
GitLab