libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

fix: ensuring placeholders can be used with --import-realm (#33589)

Browse source 
closes: #33578

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2024-10-04 12:59:55 -04:00 committed by GitHub
parent e7ad9ff2d6
commit cb3954fc7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportDistTest.java vendored
View file

@ -26,7 +26,6 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.CLIResult;
import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DistributionTest;
import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.RawDistOnly;
import org.keycloak.it.junit5.extension.WithEnvVars;
import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.KeycloakDistribution;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

2
quarkus/tests/integration/src/test/resources/quickstart-realm.json
View file

@ -1,6 +1,6 @@
{ {
"realm": "quickstart-realm", "realm": "quickstart-realm",
"enabled": true, "enabled": ${TEST_REALM_ENABLED:true},
"accessTokenLifespan": 60, "accessTokenLifespan": 60,
"accessCodeLifespan": 60, "accessCodeLifespan": 60,
"accessCodeLifespanUserAction": 300, "accessCodeLifespanUserAction": 300,

1
services/src/main/java/org/keycloak/exportimport/ExportImportManager.java
View file

@ -95,6 +95,7 @@ public class ExportImportManager {
if (dir == null) { if (dir == null) {
throw new IllegalStateException("Import not enabled"); throw new IllegalStateException("Import not enabled");
} }
ExportImportConfig.setReplacePlaceholders(true);
return getStartupImportProviders(dir).map(Supplier::get).anyMatch(provider -> { return getStartupImportProviders(dir).map(Supplier::get).anyMatch(provider -> {
try { try {