Update to KC 10.0.1 and use quarkus-keycloak-admin-client in KC authorization tests

.github/workflows/ci-actions.yml

@@ -122,7 +122,7 @@ jobs:
 
     services:
       keycloak:
-        image: quay.io/keycloak/keycloak:10.0.0
+        image: quay.io/keycloak/keycloak:10.0.1
         env:
           KEYCLOAK_USER: admin
           KEYCLOAK_PASSWORD: admin
@@ -506,7 +506,7 @@ jobs:
               -server -Xms64m -Xmx512m -XX:MetaspaceSize=96M \
               -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true \
               -Dkeycloak.profile.feature.upload_scripts=enabled" \
-            -d quay.io/keycloak/keycloak:10.0.0
+            -d quay.io/keycloak/keycloak:10.0.1
         if: matrix.keycloak
       - uses: actions/checkout@v2
       - name: Set up JDK 11

bom/runtime/pom.xml

@@ -184,7 +184,7 @@
         <jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.7.2</antlr.version>
         <quarkus-security.version>1.1.1.Final</quarkus-security.version>
-        <keycloak.version>10.0.0</keycloak.version>
+        <keycloak.version>10.0.1</keycloak.version>
         <logstash-gelf.version>1.14.0</logstash-gelf.version>
         <jsch.version>0.1.55</jsch.version>
         <jzlib.version>1.1.1</jzlib.version>

build-parent/pom.xml

@@ -81,7 +81,7 @@
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update .github/workflows/ci-actions.yml to match the version -->
-        <keycloak.docker.image>quay.io/keycloak/keycloak:10.0.0</keycloak.docker.image>
+        <keycloak.docker.image>quay.io/keycloak/keycloak:10.0.1</keycloak.docker.image>
 
         <unboundid-ldap.version>4.0.13</unboundid-ldap.version>
 

integration-tests/keycloak-authorization/src/main/resources/application.properties

@@ -49,3 +49,4 @@ quarkus.keycloak.policy-enforcer.paths.8.name=Public
 quarkus.keycloak.policy-enforcer.paths.8.path=/hello
 quarkus.keycloak.policy-enforcer.paths.8.enforcement-mode=DISABLED
 
+admin-url=${keycloak.url}

integration-tests/oidc-code-flow/pom.xml

@@ -23,10 +23,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-oidc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-keycloak-admin-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jackson</artifactId>

integration-tests/oidc-code-flow/src/main/resources/application.properties

@@ -1,6 +1,3 @@
-# Configuration file
-admin-url=${keycloak.url}
-
 # Default tenant configuration
 quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus
 quarkus.oidc.client-id=quarkus-app

integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java

@@ -1,58 +1,75 @@
 package io.quarkus.it.keycloak;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.keycloak.admin.client.Keycloak;
-import org.keycloak.admin.client.KeycloakBuilder;
+import org.keycloak.representations.AccessTokenResponse;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.RoleRepresentation;
 import org.keycloak.representations.idm.RolesRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
 
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
 
 public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
 
     private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
-    static final String KEYCLOAK_REALM = "quarkus";
-
-    private Keycloak keycloak;
+    private static final String KEYCLOAK_REALM = "quarkus";
     private List<RealmRepresentation> realms = new ArrayList<>();
 
     @Override
     public Map<String, String> start() {
-        keycloak = createKeycloakClient();
 
-        RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
-        keycloak.realms().create(realm);
-        realms.add(realm);
+        try {
+
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+            createRealmInKeycloak(realm);
+            realms.add(realm);
 
-        RealmRepresentation logoutRealm = createRealm("logout-realm");
-        // revoke refresh tokens so that they can only be used once
-        logoutRealm.setRevokeRefreshToken(true);
-        logoutRealm.setRefreshTokenMaxReuse(0);
-        logoutRealm.setSsoSessionMaxLifespan(15);
-        logoutRealm.setAccessTokenLifespan(5);
-        keycloak.realms().create(logoutRealm);
-        realms.add(logoutRealm);
+            RealmRepresentation logoutRealm = createRealm("logout-realm");
+            // revoke refresh tokens so that they can only be used once
+            logoutRealm.setRevokeRefreshToken(true);
+            logoutRealm.setRefreshTokenMaxReuse(0);
+            logoutRealm.setSsoSessionMaxLifespan(15);
+            logoutRealm.setAccessTokenLifespan(5);
+            createRealmInKeycloak(logoutRealm);
+            realms.add(logoutRealm);
 
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return Collections.emptyMap();
     }
 
-    private static Keycloak createKeycloakClient() {
-        return KeycloakBuilder.builder()
-                .serverUrl(KEYCLOAK_SERVER_URL)
-                .realm("master")
-                .clientId("admin-cli")
-                .username("admin")
-                .password("admin")
-                .build();
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static void createRealmInKeycloak(RealmRepresentation realm) throws IOException {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .contentType("application/json")
+                .body(JsonSerialization.writeValueAsBytes(realm))
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                .statusCode(201);
     }
 
     private static RealmRepresentation createRealm(String name) {
@@ -62,8 +79,8 @@ private static RealmRepresentation createRealm(String name) {
         realm.setEnabled(true);
         realm.setUsers(new ArrayList<>());
         realm.setClients(new ArrayList<>());
-        realm.setSsoSessionMaxLifespan(3); // 3 seconds
-        realm.setAccessTokenLifespan(4); // 4 seconds
+        realm.setSsoSessionMaxLifespan(3); // sec
+        realm.setAccessTokenLifespan(4); // 3 seconds
 
         RolesRepresentation roles = new RolesRepresentation();
         List<RoleRepresentation> realmRoles = new ArrayList<>();
@@ -84,26 +101,26 @@ private static RealmRepresentation createRealm(String name) {
         return realm;
     }
 
-    private static ClientRepresentation createClient(String clientId) {
+    private static ClientRepresentation createClientJwt(String clientId) {
         ClientRepresentation client = new ClientRepresentation();
 
         client.setClientId(clientId);
         client.setEnabled(true);
         client.setRedirectUris(Arrays.asList("*"));
-        client.setClientAuthenticatorType("client-secret");
-        client.setSecret("secret");
+        client.setClientAuthenticatorType("client-secret-jwt");
+        client.setSecret("AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow");
 
         return client;
     }
 
-    private static ClientRepresentation createClientJwt(String clientId) {
+    private static ClientRepresentation createClient(String clientId) {
         ClientRepresentation client = new ClientRepresentation();
 
         client.setClientId(clientId);
         client.setEnabled(true);
         client.setRedirectUris(Arrays.asList("*"));
-        client.setClientAuthenticatorType("client-secret-jwt");
-        client.setSecret("AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow");
+        client.setClientAuthenticatorType("client-secret");
+        client.setSecret("secret");
 
         return client;
     }
@@ -130,11 +147,11 @@ private static UserRepresentation createUser(String username, String... realmRol
     @Override
     public void stop() {
         for (RealmRepresentation realm : realms) {
-            try {
-                keycloak.realm(realm.getRealm()).remove();
-            } catch (Exception ignore) {
-
-            }
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .when()
+                    .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + realm.getRealm()).thenReturn().prettyPrint();
         }
     }
 }