From 1d4e8118f0cbb76db5730158501e74d98c92f7ba Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 20 Mar 2015 06:04:36 +0100 Subject: [PATCH] Updated admin-client to use new token endpoint --- .../client/resource/KeycloakAdminFactory.java | 27 ------------------- .../admin/client/token/TokenManager.java | 2 ++ .../admin/client/token/TokenService.java | 4 +-- 3 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeycloakAdminFactory.java diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeycloakAdminFactory.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeycloakAdminFactory.java deleted file mode 100644 index 3b3d11fe81..0000000000 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeycloakAdminFactory.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.keycloak.admin.client.resource; - -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; -import org.keycloak.admin.client.Config; -import org.keycloak.admin.client.token.TokenManager; - -/** - * @author rodrigo.sasaki@icarros.com.br - */ -public class KeycloakAdminFactory { - - private KeycloakAdminFactory(){} - - public static RealmResource getRealm(Config config, TokenManager tokenManager, String realmName){ - ResteasyClient client = new ResteasyClientBuilder().build(); - ResteasyWebTarget target = client.target(config.getServerUrl()); - - target.register(new BearerAuthFilter(tokenManager.getAccessTokenString())); - - RealmsResource adminRoot = target.proxy(RealmsResource.class); - - return adminRoot.realm(realmName); - } - -} diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java index f5a796dd24..e38da50a1c 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java @@ -43,6 +43,7 @@ public class TokenManager { ResteasyWebTarget target = client.target(config.getServerUrl()); Form form = new Form() + .param("grant_type", "password") .param("username", config.getUsername()) .param("password", config.getPassword()); @@ -64,6 +65,7 @@ public class TokenManager { ResteasyWebTarget target = client.target(config.getServerUrl()); Form form = new Form() + .param("grant_type", "refresh_token") .param("username", config.getUsername()) .param("password", config.getPassword()); diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java index 376e5f0d5a..4711b26f76 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java @@ -18,11 +18,11 @@ import javax.ws.rs.core.MultivaluedMap; public interface TokenService { @POST - @Path("/realms/{realm}/protocol/openid-connect/grants/access") + @Path("/realms/{realm}/protocol/openid-connect/token") public AccessTokenResponse grantToken(@PathParam("realm") String realm, MultivaluedMap map); @POST - @Path("/realms/{realm}/protocol/openid-connect/refresh") + @Path("/realms/{realm}/protocol/openid-connect/token") public AccessTokenResponse refreshToken(@PathParam("realm") String realm, MultivaluedMap map); }