Sso 19 (#147)

* delete codeforlife-sso-service * add codeforlife-sso-backend submodule * new sso backend * update refs * update refs --------- Co-authored-by: --global <--global>
ocadotechnology · Sep 30, 2024 · c6337bf · c6337bf
1 parent c498ecc
commit c6337bf
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "codeforlife-package-javascript"]
 	path = codeforlife-package-javascript
 	url = https://github.com/ocadotechnology/codeforlife-package-javascript.git
-[submodule "codeforlife-sso"]
-	path = codeforlife-sso
-	url = https://github.com/ocadotechnology/codeforlife-sso.git
 [submodule "codeforlife-portal-frontend"]
 	path = codeforlife-portal-frontend
 	url = https://github.com/ocadotechnology/codeforlife-portal-frontend.git
@@ -34,3 +31,6 @@
 [submodule "codeforlife-contributor-frontend"]
 	path = codeforlife-contributor-frontend
 	url = https://github.com/ocadotechnology/codeforlife-contributor-frontend.git
+[submodule "codeforlife-sso-backend"]
+	path = codeforlife-sso-backend
+	url = https://github.com/ocadotechnology/codeforlife-sso-backend.git
diff --git a/codeforlife-contributor-backend b/codeforlife-contributor-backend
diff --git a/codeforlife-package-javascript b/codeforlife-package-javascript
diff --git a/codeforlife-package-python b/codeforlife-package-python
diff --git a/codeforlife-portal b/codeforlife-portal
diff --git a/codeforlife-portal-backend b/codeforlife-portal-backend
diff --git a/codeforlife-portal-frontend b/codeforlife-portal-frontend
diff --git a/codeforlife-sso b/codeforlife-sso
diff --git a/codeforlife-sso-backend b/codeforlife-sso-backend
diff --git a/codeforlife-template-backend b/codeforlife-template-backend
diff --git a/codeforlife.code-workspace b/codeforlife.code-workspace
@@ -27,9 +27,9 @@
     {
       "path": "codeforlife-portal-frontend"
     },
-    // {
-    //   "path": "codeforlife-sso"
-    // },
+    {
+      "path": "codeforlife-sso-backend"
+    },
     {
       "path": "codeforlife-template-backend"
     },

diff --git a/rapid-router b/rapid-router
+2 −2		Pipfile
+260 −78		Pipfile.lock
+1 −1		api/views/session_test.py
+0 −1		settings.py
+7 −0		CHANGELOG.md
+1 −1		package.json
+5 −1		src/api/endpoints/klass.ts
+19 −0		src/components/table/CellStack.tsx
+53 −0		src/components/table/Table.tsx
+10 −0		src/components/table/index.tsx
+5 −1		src/theme/components/MuiTableHead.ts
+24 −0		CHANGELOG.md
+4 −3		Pipfile
+140 −48		Pipfile.lock
+1 −1		codeforlife/__init__.py
+10 −17		codeforlife/settings/django.py
+11 −1		codeforlife/user/filters/klass.py
+3 −3		codeforlife/user/migrations/0001_initial.py
+2 −1		codeforlife/user/models/otp_bypass_token.py
+25 −0		codeforlife/user/views/klass_test.py
+28 −34		codeforlife/user/views/user.py
+5 −4		codeforlife/user/views/user_test.py
+1 −1		codeforlife/version.py
+0 −6		manage.py
+5 −0		.github/ISSUE_TEMPLATE/bug_report.md
+5 −2		.github/ISSUE_TEMPLATE/new_task.md
+18 −0		cfl_common/common/migrations/0055_alter_schoolteacherinvitation_token.py
+1 −1		cfl_common/common/models.py
+1 −1		portal/__init__.py
+9 −8		portal/templates/portal/about.html
+1 −1		portal/templates/portal/email_style_template.html
+2 −2		portal/templates/portal/partials/footer.html
+1 −1		portal/templates/portal/partials/header.html
+36 −7		portal/tests/test_views.py
+9 −0		portal/views/cron/user.py
+2 −2		Pipfile
+276 −94		Pipfile.lock
+0 −1		settings.py
+3 −1		src/rapid_router/views/level.py
+17 −11		src/rapid_router/views/level_test.py