mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-05 22:39:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: admin cli client should set the content when performing a merge (#30539)

Browse Source 
closes: #29878

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins
2024-06-28 09:56:07 -04:00
committed by GitHub
parent cc2ccc87b0
commit d534860e2b
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AbstractRequestCmd.java
View File

@@ -29,6 +29,7 @@ import org.keycloak.client.cli.util.HeadersBodyStatus;
import org.keycloak.client.cli.util.HttpUtil;
import org.keycloak.client.cli.util.OutputFormat;
import org.keycloak.client.cli.util.ReturnFields;
import org.keycloak.util.JsonSerialization;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -265,6 +266,11 @@ public abstract class AbstractRequestCmd extends AbstractAuthOptionsCmd {
ReflectionUtil.merge(ctx.getResult(), (ObjectNode) ctxremote.getResult());
}
ctx = ctxremote;
try {
ctx.setContent(JsonSerialization.writeValueAsString(ctxremote.getResult()));
} catch (IOException e) {
throw new RuntimeException("Could not convert merge result to string " + e.getMessage(), e);
}
}
if (attrs.size() > 0) {