From 65206a72b23d4ea9ecc5a265c95ff77643918de8 Mon Sep 17 00:00:00 2001 From: mposolda Date: Thu, 29 May 2014 09:19:49 +0200 Subject: [PATCH 1/4] Change default timeouts for testrealm.json bundled in examples --- examples/demo-template/testrealm.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/demo-template/testrealm.json b/examples/demo-template/testrealm.json index a99aa9ddf4..ef295e70f0 100755 --- a/examples/demo-template/testrealm.json +++ b/examples/demo-template/testrealm.json @@ -1,9 +1,11 @@ { "realm": "demo", "enabled": true, - "accessTokenLifespan": 3000, - "accessCodeLifespan": 10, - "accessCodeLifespanUserAction": 6000, + "accessTokenLifespan": 60, + "accessCodeLifespan": 60, + "accessCodeLifespanUserAction": 300, + "ssoSessionIdleTimeout": 600, + "ssoSessionMaxLifespan": 36000, "passwordCredentialGrantAllowed": true, "sslNotRequired": true, "registrationAllowed": false, From f0d37b19e21d83936349e12950e9410822505bae Mon Sep 17 00:00:00 2001 From: mposolda Date: Thu, 29 May 2014 10:28:54 +0200 Subject: [PATCH 2/4] Fix typo in docs --- docbook/reference/en/en-US/modules/admin-permissions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docbook/reference/en/en-US/modules/admin-permissions.xml b/docbook/reference/en/en-US/modules/admin-permissions.xml index 00bbfc1669..e5176c2beb 100755 --- a/docbook/reference/en/en-US/modules/admin-permissions.xml +++ b/docbook/reference/en/en-US/modules/admin-permissions.xml @@ -2,7 +2,7 @@ Master Admin Access Control You can create and manage multiple realms by logging into the master Keycloak admin console - at /{keycloak-root/admin/index.html + at /{keycloak-root}/admin/index.html Users in the Keycloak master realm can be granted permission to manage zero or more realms that are From c4808a3e61559ef34db020932b06eb7e4e8af75e Mon Sep 17 00:00:00 2001 From: mposolda Date: Thu, 29 May 2014 10:29:06 +0200 Subject: [PATCH 3/4] Fix admin-App example --- .../src/main/java/org/keycloak/example/AdminClient.java | 9 ++------- .../admin-access-app/src/main/webapp/index.html | 5 +++++ 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 examples/demo-template/admin-access-app/src/main/webapp/index.html diff --git a/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java b/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java index 6f631401a5..09a3633bcc 100755 --- a/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java +++ b/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java @@ -8,19 +8,14 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.message.BasicNameValuePair; -import org.keycloak.KeycloakSecurityContext; import org.keycloak.OAuth2Constants; import org.keycloak.ServiceUrlConstants; import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.representations.IDToken; -import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; import org.keycloak.util.KeycloakUriBuilder; -import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -107,8 +102,8 @@ public class AdminClient { try { HttpGet get = new HttpGet(KeycloakUriBuilder.fromUri("http://localhost:8080/auth") - .path(ServiceUrlConstants.TOKEN_SERVICE_LOGIN_PATH) - .queryParam("session-state", res.getSessionState()) + .path(ServiceUrlConstants.TOKEN_SERVICE_LOGOUT_PATH) + .queryParam("session_state", res.getSessionState()) .build("demo")); HttpResponse response = client.execute(get); HttpEntity entity = response.getEntity(); diff --git a/examples/demo-template/admin-access-app/src/main/webapp/index.html b/examples/demo-template/admin-access-app/src/main/webapp/index.html new file mode 100644 index 0000000000..22f152da8e --- /dev/null +++ b/examples/demo-template/admin-access-app/src/main/webapp/index.html @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From 06b949980573b45502a7c2bf9fb40fb89fb1fd12 Mon Sep 17 00:00:00 2001 From: mposolda Date: Thu, 29 May 2014 11:42:54 +0200 Subject: [PATCH 4/4] Fixing typo in admin console causing errors when change passwordCredentialsGrant --- .../theme/admin/base/resources/partials/realm-detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html index 96b6d5f49d..3b735ddf00 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html @@ -69,7 +69,7 @@
- +