Skip to content

[NAE-2211] Fix partial update for SecretString #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
machacjozef merged 2 commits into from
Sep 30, 2025
Merged

[NAE-2211] Fix partial update for SecretString #359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38cd576
[NAE-2211] Fix partial update for SecretString
machacjozef Sep 12, 2025
46acf92
Merge remote-tracking branch 'origin/release/7.0.0-rev8' into NAE-2211
machacjozef Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/RealmServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.netgrif.application.engine.auth.service;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.netgrif.application.engine.adapter.spring.configuration.AbstractMongoIndexesConfigurator;
import com.netgrif.application.engine.auth.provider.AbstractAuthConfig;
import com.netgrif.application.engine.auth.provider.AuthMethodProvider;
Expand All @@ -20,6 +22,7 @@
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;

import java.io.IOException;
import java.util.Map;
import java.util.Optional;

Expand All @@ -35,6 +38,9 @@ public class RealmServiceImpl implements RealmService {
@Autowired
private MongoTemplate mongoTemplate;

@Autowired
private ObjectMapper objectMapper;

@Autowired
private AnonymousUserRefService anonymousUserRefService;

Expand Down Expand Up @@ -254,20 +260,15 @@ public AuthMethodConfig<?> partialUpdateConfigInRealm(String realmId, String pro
Map<String, Object> configUpdates = updates.getConfiguration();
Object targetConfig = existingConfig.getConfiguration();

if (targetConfig != null && configUpdates != null) {
for (Map.Entry<String, Object> entry : configUpdates.entrySet()) {
try {
var field = targetConfig.getClass().getDeclaredField(entry.getKey());
field.setAccessible(true);
field.set(targetConfig, entry.getValue());
} catch (NoSuchFieldException | IllegalAccessException e) {
log.warn("Skipped field '{}' due to error: {}", entry.getKey(), e.getMessage());
}
if (targetConfig != null && configUpdates != null && !configUpdates.isEmpty()) {
try {
JsonNode patchNode = objectMapper.valueToTree(configUpdates);
objectMapper.readerForUpdating(targetConfig).readValue(patchNode);
} catch (IOException e) {
throw new IllegalArgumentException("Failed to apply configuration patch", e);
}
Comment thread
machacjozef marked this conversation as resolved.
}

realmRepository.save((com.netgrif.application.engine.adapter.spring.auth.domain.Realm) realm);

return existingConfig;
}

Expand Down
Loading