Merge pull request 'Import urls.py and settings.py' (#1) from libertacasa-saml into libertacasa-master

Reviewed-on: https://git.com.de/LibertaCasa/takahe/pulls/1

1 files changed, 5 insertions, 1 deletions

diff --git a/takahe/urls.py b/takahe/urls.py
index d3572a9..ea205c5 100644
--- a/takahe/urls.py
+++ b/takahe/urls.py
@@ -9,6 +9,9 @@ from mediaproxy import views as mediaproxy
 from stator import views as stator
 from users.views import activitypub, admin, auth, identity, report, settings
 
+from django.conf.urls import include
+from django.views.generic.base import RedirectView
+
 urlpatterns = [
     path("", core.homepage),
     path("manifest.json", core.AppManifest.as_view()),
@@ -174,7 +177,7 @@ urlpatterns = [
     path("@<handle>/posts/<int:post_id>/report/", report.SubmitReport.as_view()),
     path("@<handle>/posts/<int:post_id>/edit/", compose.Compose.as_view()),
     # Authentication
-    path("auth/login/", auth.Login.as_view(), name="login"),
+    path("auth/login/", RedirectView.as_view(url='/saml2/login', permanent=False), name='login'),
     path("auth/logout/", auth.Logout.as_view(), name="logout"),
     path("auth/signup/", auth.Signup.as_view(), name="signup"),
     path("auth/reset/", auth.TriggerReset.as_view(), name="trigger_reset"),
@@ -248,4 +251,5 @@ urlpatterns = [
         core.custom_static_serve,
         kwargs={"document_root": djsettings.MEDIA_ROOT},
     ),
+    path('saml2/', include('djangosaml2.urls')),
 ]