From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sat, 26 Oct 2024 07:57:36 +0000 (-0700)
Subject: Fix: oauth settings without base url (#8020)
X-Git-Tag: v2.13.1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53aa216a4ae57f68d75a15d2762ff91f2d177e4a;p=thirdparty%2Fpaperless-ngx.git

Fix: oauth settings without base url (#8020)
---

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index c1cb62c9e8..d6489fa817 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -1208,10 +1208,14 @@ OAUTH_CALLBACK_BASE_URL = os.getenv("PAPERLESS_OAUTH_CALLBACK_BASE_URL")
 GMAIL_OAUTH_CLIENT_ID = os.getenv("PAPERLESS_GMAIL_OAUTH_CLIENT_ID")
 GMAIL_OAUTH_CLIENT_SECRET = os.getenv("PAPERLESS_GMAIL_OAUTH_CLIENT_SECRET")
 GMAIL_OAUTH_ENABLED = bool(
-    OAUTH_CALLBACK_BASE_URL and GMAIL_OAUTH_CLIENT_ID and GMAIL_OAUTH_CLIENT_SECRET,
+    (OAUTH_CALLBACK_BASE_URL or PAPERLESS_URL)
+    and GMAIL_OAUTH_CLIENT_ID
+    and GMAIL_OAUTH_CLIENT_SECRET,
 )
 OUTLOOK_OAUTH_CLIENT_ID = os.getenv("PAPERLESS_OUTLOOK_OAUTH_CLIENT_ID")
 OUTLOOK_OAUTH_CLIENT_SECRET = os.getenv("PAPERLESS_OUTLOOK_OAUTH_CLIENT_SECRET")
 OUTLOOK_OAUTH_ENABLED = bool(
-    OAUTH_CALLBACK_BASE_URL and OUTLOOK_OAUTH_CLIENT_ID and OUTLOOK_OAUTH_CLIENT_SECRET,
+    (OAUTH_CALLBACK_BASE_URL or PAPERLESS_URL)
+    and OUTLOOK_OAUTH_CLIENT_ID
+    and OUTLOOK_OAUTH_CLIENT_SECRET,
 )