From 857d6729ef3e678da7a936ecf2d8ec2ace950e33 Mon Sep 17 00:00:00 2001
From: Alexander Tomokhov <alexoundos@selfprivacy.org>
Date: Wed, 29 Jan 2025 13:21:36 +0400
Subject: [PATCH] fix nextcloud when sp.modules.auth.enable is true

---
 sp-modules/nextcloud/config-paths-needed.json | 6 ++++++
 sp-modules/nextcloud/module.nix               | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sp-modules/nextcloud/config-paths-needed.json b/sp-modules/nextcloud/config-paths-needed.json
index 1e846f9..a263bbd 100644
--- a/sp-modules/nextcloud/config-paths-needed.json
+++ b/sp-modules/nextcloud/config-paths-needed.json
@@ -1,6 +1,12 @@
 [
   [ "passthru", "selfprivacy", "auth", "admins-group" ],
   [ "passthru", "selfprivacy", "auth", "full-users-group" ],
+  [ "passthru", "selfprivacy", "auth", "ldap-base-dn" ],
+  [ "passthru", "selfprivacy", "auth", "ldap-host" ],
+  [ "passthru", "selfprivacy", "auth", "ldap-port" ],
+  [ "passthru", "selfprivacy", "auth", "oauth2-discovery-url" ],
+  [ "passthru", "selfprivacy", "auth", "oauth2-provider-name" ],
+  [ "passthru", "selfprivacy", "auth", "oauth2-systemd-service" ],
   [ "security", "acme", "certs" ],
   [ "selfprivacy", "domain" ],
   [ "selfprivacy", "modules", "auth", "enable" ],
diff --git a/sp-modules/nextcloud/module.nix b/sp-modules/nextcloud/module.nix
index 62104ac..f353e17 100644
--- a/sp-modules/nextcloud/module.nix
+++ b/sp-modules/nextcloud/module.nix
@@ -11,7 +11,7 @@ let
 
   hostName = "${cfg.subdomain}.${sp.domain}";
   auth-passthru = config.passthru.selfprivacy.auth;
-  is-auth-enabled = sp.modules.nextcloud.enableSso;
+  is-auth-enabled = sp.modules.auth.enable or false;
   cfg = sp.modules.nextcloud;
   ldap_scheme_and_host = "ldaps://${auth-passthru.ldap-host}";