Include all settings in put request to prevent overwrite (#405)

netbirdio · Jul 31, 2024 · 650496f · 650496f
1 parent 121778c
commit 650496f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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(() => {