From 1723b80c52c9c769ba98090f60b68b1a3f8da2fa Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:57:37 -0700
Subject: [PATCH] Prevent logout loop

---
 src/documents/templates/account/login.html |  2 +-
 src/paperless/settings.py                  |  5 ++++-
 src/paperless/tests/test_settings.py       | 10 ++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/documents/templates/account/login.html b/src/documents/templates/account/login.html
index 14e03cdb7..e3e9ec40a 100644
--- a/src/documents/templates/account/login.html
+++ b/src/documents/templates/account/login.html
@@ -59,7 +59,7 @@
                                 <button type="submit" class="btn btn-secondary">{{ provider.name }}</button>
                             </form>
                         </li>
-                    {% if REDIRECT_LOGIN_TO_SSO and forloop.counter0 == 0 %}
+                    {% if REDIRECT_LOGIN_TO_SSO and forloop.counter0 == 0 and request.GET.loggedout != '1' %}
                         <script type="text/javascript">
                             const form = document.getElementById('social-login');
                             if (form) {
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 30b4b1822..fe7caebb8 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -369,7 +369,10 @@ def _parse_base_paths() -> tuple[str, str, str, str, str]:
     base_url = (script_name or "") + "/"
     login_url = base_url + "accounts/login/"
     login_redirect_url = base_url + "dashboard"
-    logout_redirect_url = os.getenv("PAPERLESS_LOGOUT_REDIRECT_URL", base_url)
+    logout_redirect_url = os.getenv(
+        "PAPERLESS_LOGOUT_REDIRECT_URL",
+        login_url + "?loggedout=1",
+    )
     return script_name, base_url, login_url, login_redirect_url, logout_redirect_url
 
 
diff --git a/src/paperless/tests/test_settings.py b/src/paperless/tests/test_settings.py
index 511148523..5c257a08c 100644
--- a/src/paperless/tests/test_settings.py
+++ b/src/paperless/tests/test_settings.py
@@ -410,7 +410,10 @@ class TestPathSettings(TestCase):
         self.assertEqual("/", base_paths[1])  # BASE_URL
         self.assertEqual("/accounts/login/", base_paths[2])  # LOGIN_URL
         self.assertEqual("/dashboard", base_paths[3])  # LOGIN_REDIRECT_URL
-        self.assertEqual("/", base_paths[4])  # LOGOUT_REDIRECT_URL
+        self.assertEqual(
+            "/accounts/login/?loggedout=1",
+            base_paths[4],
+        )  # LOGOUT_REDIRECT_URL
 
     @mock.patch("os.environ", {"PAPERLESS_FORCE_SCRIPT_NAME": "/paperless"})
     def test_subpath(self):
@@ -427,7 +430,10 @@ class TestPathSettings(TestCase):
         self.assertEqual("/paperless/", base_paths[1])  # BASE_URL
         self.assertEqual("/paperless/accounts/login/", base_paths[2])  # LOGIN_URL
         self.assertEqual("/paperless/dashboard", base_paths[3])  # LOGIN_REDIRECT_URL
-        self.assertEqual("/paperless/", base_paths[4])  # LOGOUT_REDIRECT_URL
+        self.assertEqual(
+            "/paperless/accounts/login/?loggedout=1",
+            base_paths[4],
+        )  # LOGOUT_REDIRECT_URL
 
     @mock.patch(
         "os.environ",