Merge branch 'master' into new-storage

2023-06-09 13:41:16 +02:00
parent 09a09cf1cf c99c440719
commit e7eb0a7621
9 changed files with 80 additions and 5 deletions
@@ -33,7 +33,8 @@ def init_oauth() -> OAuth:
            client_secret=settings.github_client_secret,
        )
    if (
-        settings.custom_openid_provider.client_id is not None
+        settings.custom_openid_provider is not None
+        and settings.custom_openid_provider.client_id is not None
        and settings.custom_openid_provider.client_secret is not None
    ):
        oauth.register(