From 650496f670b7340456d0f9731f617c0f7cfd4a1f Mon Sep 17 00:00:00 2001
From: Eduard Gert <kontakt@eduardgert.de>
Date: Wed, 31 Jul 2024 18:48:59 +0200
Subject: [PATCH] Include all settings in put request to prevent overwrite
 (#405)

---
 src/modules/settings/AuthenticationTab.tsx | 1 +
 src/modules/settings/GroupsTab.tsx         | 4 +---
 src/modules/settings/PermissionsTab.tsx    | 9 +--------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/modules/settings/AuthenticationTab.tsx b/src/modules/settings/AuthenticationTab.tsx
index 11f0235..a6dca77 100644
--- a/src/modules/settings/AuthenticationTab.tsx
+++ b/src/modules/settings/AuthenticationTab.tsx
@@ -99,6 +99,7 @@ export default function AuthenticationTab({ account }: Props) {
         .put({
           id: account.id,
           settings: {
+            ...account.settings,
             peer_login_expiration_enabled: loginExpiration,
             peer_login_expiration: loginExpiration ? expiration : 86400,
             extra: {
diff --git a/src/modules/settings/GroupsTab.tsx b/src/modules/settings/GroupsTab.tsx
index 974fd68..d96c5ea 100644
--- a/src/modules/settings/GroupsTab.tsx
+++ b/src/modules/settings/GroupsTab.tsx
@@ -108,10 +108,8 @@ export default function GroupsTab({ account }: Props) {
         .put({
           id: account.id,
           settings: {
+            ...account.settings,
             groups_propagation_enabled: groupsPropagation,
-            peer_login_expiration_enabled:
-              account.settings.peer_login_expiration_enabled,
-            peer_login_expiration: account.settings.peer_login_expiration,
             jwt_groups_enabled: jwtGroupSync,
             jwt_groups_claim_name: isEmpty(jwtGroupsClaimName)
               ? undefined
diff --git a/src/modules/settings/PermissionsTab.tsx b/src/modules/settings/PermissionsTab.tsx
index 81e40b7..f30512e 100644
--- a/src/modules/settings/PermissionsTab.tsx
+++ b/src/modules/settings/PermissionsTab.tsx
@@ -33,15 +33,8 @@ export default function PermissionsTab({ account }: Props) {
         .put({
           id: account.id,
           settings: {
+            ...account.settings,
             regular_users_view_blocked: userViewBlocked,
-            groups_propagation_enabled:
-              account.settings?.groups_propagation_enabled,
-            peer_login_expiration_enabled:
-              account.settings?.peer_login_expiration_enabled,
-            peer_login_expiration: account.settings?.peer_login_expiration,
-            jwt_groups_enabled: account.settings?.jwt_groups_enabled,
-            jwt_groups_claim_name: account.settings?.jwt_groups_claim_name,
-            jwt_allow_groups: account.settings?.jwt_allow_groups,
           },
         })
         .then(() => {