feat(config): make resolver support null value to delete a

key.
This commit is contained in:
2026-09-08 23:10:26 +08:00
parent 786f364743
commit 8b43e8b2ea
2 changed files with 8 additions and 2 deletions
+7 -1
View File
@@ -121,9 +121,15 @@ func UpdateSettings(settingsType string, patch map[string]interface{}) error {
// deepMergeSettings recursively overlays src onto dst. Object values merge
// key-by-key so partial updates keep sibling keys untouched; arrays and scalars
// always replace the destination value.
// always replace the destination value. A JSON null in the payload removes that
// key from dst, giving clients a way to delete entries (members, nodes, map
// rows) through /api/settings/set.
func deepMergeSettings(dst, src map[string]interface{}) {
for key, srcVal := range src {
if srcVal == nil {
delete(dst, key)
continue
}
srcObj, srcIsObj := srcVal.(map[string]interface{})
if srcIsObj {
if dstObj, ok := dst[key].(map[string]interface{}); ok {
+1 -1
View File
@@ -108,7 +108,7 @@ func RegisterFirstUser(username, password, level string) (int64, error) {
return 0, fmt.Errorf("failed to check existing users: %w", err)
}
if count > 0 {
return 0, errors.New("registration closed: users already exist")
return 0, ErrUsersExist
}
result, err := tx.Exec(