diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js index a7342347ea..355091b171 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js @@ -468,7 +468,7 @@ module.factory('ApplicationClaims', function($resource) { }); module.factory('ApplicationPushRevocation', function($resource) { - return $resource('//auth/rest/admin/realms/:realm/applications/:application/push-revocation', { + return $resource('/auth/rest/admin/realms/:realm/applications/:application/push-revocation', { realm : '@realm', application : "@application" }); diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-revocation.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-revocation.html index 26f38817c7..a610a308ca 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-revocation.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-revocation.html @@ -28,8 +28,6 @@ - diff --git a/examples/demo-template/database-service/src/main/java/org/keycloak/example/oauth/CustomerService.java b/examples/demo-template/database-service/src/main/java/org/keycloak/example/oauth/CustomerService.java index b1cf249e21..8f5f5b1c57 100755 --- a/examples/demo-template/database-service/src/main/java/org/keycloak/example/oauth/CustomerService.java +++ b/examples/demo-template/database-service/src/main/java/org/keycloak/example/oauth/CustomerService.java @@ -22,7 +22,7 @@ public class CustomerService { rtn.add("Bill Burke"); rtn.add("Stian Thorgersen"); rtn.add("Stan Silvert"); - rtn.add("Gabriel Cordoso"); + rtn.add("Gabriel Cardoso"); rtn.add("Viliam Rockai"); rtn.add("Marek Posolda"); rtn.add("Boleslaw Dawidowicz"); diff --git a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java index f800381b0e..d084758673 100755 --- a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java @@ -82,7 +82,7 @@ public class ResourceAdminManager { protected boolean pushRevocationPolicy(RealmModel realm, ApplicationModel resource, int notBefore, ResteasyClient client) { - if (realm.getNotBefore() <= 0) return false; + if (notBefore <= 0) return false; String managementUrl = resource.getManagementUrl(); if (managementUrl != null) { PushNotBeforeAction adminAction = new PushNotBeforeAction(TokenIdGenerator.generateId(), (int)(System.currentTimeMillis() / 1000) + 30, resource.getName(), notBefore);