diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/AbstractAdapterConfigurationDefinition.java b/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/AbstractAdapterConfigurationDefinition.java index 55295c640a..c2d75a6d6a 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/AbstractAdapterConfigurationDefinition.java +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/AbstractAdapterConfigurationDefinition.java @@ -101,9 +101,9 @@ abstract class AbstractAdapterConfigurationDefinition extends SimpleResourceDefi .setAllowExpression(true) .setValidator(new IntRangeValidator(-1, true)) .build(); - protected static final SimpleAttributeDefinition COOKIE_PATH = - new SimpleAttributeDefinitionBuilder("token-cookie-path", ModelType.STRING, true) - .setXmlName("token-cookie-path") + protected static final SimpleAttributeDefinition ADAPTER_STATE_COOKIE_PATH = + new SimpleAttributeDefinitionBuilder("adapter-state-cookie-path", ModelType.STRING, true) + .setXmlName("adapter-state-cookie-path") .setAllowExpression(true) .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, true, true)) .build(); @@ -121,7 +121,7 @@ abstract class AbstractAdapterConfigurationDefinition extends SimpleResourceDefi DEPLOYMENT_ONLY_ATTRIBUTES.add(TOKEN_MINIMUM_TIME_TO_LIVE); DEPLOYMENT_ONLY_ATTRIBUTES.add(MIN_TIME_BETWEEN_JWKS_REQUESTS); DEPLOYMENT_ONLY_ATTRIBUTES.add(PUBLIC_KEY_CACHE_TTL); - DEPLOYMENT_ONLY_ATTRIBUTES.add(COOKIE_PATH); + DEPLOYMENT_ONLY_ATTRIBUTES.add(ADAPTER_STATE_COOKIE_PATH); } static final List ALL_ATTRIBUTES = new ArrayList(); diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties index 4bff0195db..3808f88640 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties @@ -98,7 +98,7 @@ keycloak.secure-deployment.public-key-cache-ttl=Maximum time the downloaded publ keycloak.secure-deployment.ignore-oauth-query-parameter=disable query parameter parsing for access_token keycloak.secure-deployment.proxy-url=The URL for the HTTP proxy if one is used. keycloak.secure-deployment.verify-token-audience=If true, then during bearer-only authentication, the adapter will verify if token contains this client name (resource) as an audience -keycloak.secure-deployment.token-cookie-path=If set, defines the path used in cookies set by the adapter. Useful when deploying the application in the root context path. +keycloak.secure-deployment.adapter-state-cookie-path=If set, defines the path used in cookies set by the adapter. Useful when deploying the application in the root context path. keycloak.secure-server=A deployment secured by Keycloak keycloak.secure-server.add=Add a deployment to be secured by Keycloak @@ -143,7 +143,7 @@ keycloak.secure-server.public-key-cache-ttl=Maximum time the downloaded public k keycloak.secure-server.ignore-oauth-query-parameter=disable query parameter parsing for access_token keycloak.secure-server.proxy-url=The URL for the HTTP proxy if one is used. keycloak.secure-server.verify-token-audience=If true, then during bearer-only authentication, the adapter will verify if token contains this client name (resource) as an audience -keycloak.secure-server.token-cookie-path=If set, defines the path used in cookies set by the adapter. Useful when deploying the application in the root context path. +keycloak.secure-server.adapter-state-cookie-path=If set, defines the path used in cookies set by the adapter. Useful when deploying the application in the root context path. keycloak.secure-deployment.credential=Credential value keycloak.secure-server.credential=Credential value diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd index 61a52042b9..339499495e 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd @@ -122,7 +122,7 @@ - + diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml b/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml index 047bc3ea92..8810c99983 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml @@ -69,7 +69,7 @@ master http-endpoint true - / + / MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4siLKUew0WYxdtq6/rwk4Uj/4amGFFnE/yzIxQVU0PUqz3QBRVkUWpDj0K6ZnS5nzJV/y6DHLEy7hjZTdRDphyF1sq09aDOYnVpzu8o2sIlMM8q5RnUyEfIyUZqwo8pSZDJ90fS0s+IDUJNCSIrAKO3w1lqZDHL6E/YFHXyzkvQIDAQAB @@ -91,7 +91,7 @@ jboss-infra wildfly-console true - / + / EXTERNAL 443 http://localhost:9000 diff --git a/core/src/main/java/org/keycloak/representations/adapters/config/AdapterConfig.java b/core/src/main/java/org/keycloak/representations/adapters/config/AdapterConfig.java index a4f0d6b7a2..555cde28f8 100755 --- a/core/src/main/java/org/keycloak/representations/adapters/config/AdapterConfig.java +++ b/core/src/main/java/org/keycloak/representations/adapters/config/AdapterConfig.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; "allow-any-hostname", "disable-trust-manager", "truststore", "truststore-password", "client-keystore", "client-keystore-password", "client-key-password", "always-refresh-token", - "register-node-at-startup", "register-node-period", "token-store", "token-cookie-path", "principal-attribute", + "register-node-at-startup", "register-node-period", "token-store", "adapter-state-cookie-path", "principal-attribute", "proxy-url", "turn-off-change-session-id-on-login", "token-minimum-time-to-live", "min-time-between-jwks-requests", "public-key-cache-ttl", "policy-enforcer", "ignore-oauth-query-parameter", "verify-token-audience" @@ -68,7 +68,7 @@ public class AdapterConfig extends BaseAdapterConfig implements AdapterHttpClien protected int registerNodePeriod = -1; @JsonProperty("token-store") protected String tokenStore; - @JsonProperty("token-cookie-path") + @JsonProperty("adapter-state-cookie-path") protected String tokenCookiePath; @JsonProperty("principal-attribute") protected String principalAttribute; diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal-root/WEB-INF/keycloak.json b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal-root/WEB-INF/keycloak.json index e699fe6aac..4726ad5137 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal-root/WEB-INF/keycloak.json +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal-root/WEB-INF/keycloak.json @@ -6,7 +6,7 @@ "ssl-required" : "external", "expose-token": true, "token-store": "cookie", - "token-cookie-path": "/", + "adapter-state-cookie-path": "/", "credentials": { "secret": "password" }