Skip to content

Commit 81d284b

Browse files
sberyozkinsberyozkin
authored
Merge pull request quarkusio#49283 from gsmet/new-keycloak
Move our tests to a recent Keycloak version
2 parents c6b6187 + 12cc82e commit 81d284b

File tree

61 files changed

+203
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+203
-107
lines changed

‎build-parent/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@
9898

9999
<!-- The image to use for tests that run Keycloak -->
100100
<keycloak.server.version>26.4.0</keycloak.server.version>
101-
<keycloak.wildfly.version>19.0.3</keycloak.wildfly.version>
102101
<keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.server.version}</keycloak.docker.image>
103-
<keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy</keycloak.docker.legacy.image>
104102

105103
<unboundid-ldap.version>7.0.3</unboundid-ldap.version>
106104

‎extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesProcessor.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@ private static RealmRepresentation createDefaultRealmRep() {
859859
realm.setAccessTokenLifespan(600);
860860
realm.setSsoSessionMaxLifespan(600);
861861
realm.setRefreshTokenMaxReuse(10);
862+
realm.setRequiredActions(List.of());
862863

863864
RolesRepresentation roles = new RolesRepresentation();
864865
List<RoleRepresentation> realmRoles = new ArrayList<>();
@@ -907,6 +908,8 @@ private static UserRepresentation createUser(String username, String password, L
907908
user.setEnabled(true);
908909
user.setCredentials(new ArrayList<>());
909910
user.setRealmRoles(realmRoles);
911+
user.setEmailVerified(true);
912+
user.setRequiredActions(List.of());
910913

911914
CredentialRepresentation credential = new CredentialRepresentation();
912915

‎extensions/oidc-client-filter/deployment/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<configuration>
113113
<skip>false</skip>
114114
<systemPropertyVariables>
115-
<keycloak.docker.image>${keycloak.docker.legacy.image}</keycloak.docker.image>
115+
<keycloak.docker.image>${keycloak.docker.image}</keycloak.docker.image>
116116
<keycloak.use.https>false</keycloak.use.https>
117117
</systemPropertyVariables>
118118
</configuration>

‎extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/AbstractRevokedAccessTokenDevModeTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ protected static QuarkusDevModeTest createQuarkusDevModeTest(String additionalPr
5151
quarkus.oidc-client.grant.type=password
5252
quarkus.oidc-client.grant-options.password.username=alice
5353
quarkus.oidc-client.grant-options.password.password=alice
54+
quarkus.oidc-client.scopes=openid
55+
quarkus.oidc-client.named.scopes=openid
5456
quarkus.oidc-client.named.auth-server-url=${quarkus.oidc.auth-server-url}
5557
quarkus.oidc-client.named.client-id=${quarkus.oidc.client-id}
5658
quarkus.oidc-client.named.credentials.client-secret.value=${quarkus.oidc.credentials.secret}

‎extensions/oidc-client-graphql/deployment/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<configuration>
121121
<skip>false</skip>
122122
<systemPropertyVariables>
123-
<keycloak.docker.image>${keycloak.docker.legacy.image}</keycloak.docker.image>
123+
<keycloak.docker.image>${keycloak.docker.image}</keycloak.docker.image>
124124
<keycloak.use.https>false</keycloak.use.https>
125125
</systemPropertyVariables>
126126
</configuration>

‎extensions/oidc-client-reactive-filter/deployment/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<configuration>
112112
<skip>false</skip>
113113
<systemPropertyVariables>
114-
<keycloak.docker.image>${keycloak.docker.legacy.image}</keycloak.docker.image>
114+
<keycloak.docker.image>${keycloak.docker.image}</keycloak.docker.image>
115115
<keycloak.use.https>false</keycloak.use.https>
116116
</systemPropertyVariables>
117117
</configuration>

‎extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/AbstractRevokedAccessTokenDevModeTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ protected static QuarkusDevModeTest createQuarkusDevModeTest(String additionalPr
5555
quarkus.oidc-client.grant.type=password
5656
quarkus.oidc-client.grant-options.password.username=alice
5757
quarkus.oidc-client.grant-options.password.password=alice
58+
quarkus.oidc-client.scopes=openid
59+
quarkus.oidc-client.named.scopes=openid
5860
quarkus.oidc-client.named.auth-server-url=${quarkus.oidc.auth-server-url}
5961
quarkus.oidc-client.named.client-id=${quarkus.oidc.client-id}
6062
quarkus.oidc-client.named.credentials.client-secret.value=${quarkus.oidc.credentials.secret}

‎extensions/oidc-client/deployment/pom.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>Quarkus - OpenID Connect Client - Deployment</name>
1414

1515
<properties>
16-
<keycloak.url>http://localhost:8180/auth</keycloak.url>
16+
<keycloak.url>http://localhost:8180</keycloak.url>
1717
</properties>
1818

1919
<dependencies>
@@ -147,14 +147,16 @@
147147
</plugins>
148148
</build>
149149
</profile>
150-
151150
<profile>
152151
<id>docker-keycloak</id>
153152
<activation>
154153
<property>
155154
<name>start-containers</name>
156155
</property>
157156
</activation>
157+
<properties>
158+
<keycloak.url>http://localhost:8180</keycloak.url>
159+
</properties>
158160
<build>
159161
<plugins>
160162
<plugin>
@@ -163,16 +165,19 @@
163165
<configuration>
164166
<images>
165167
<image>
166-
<name>${keycloak.docker.legacy.image}</name>
168+
<name>${keycloak.docker.image}</name>
167169
<alias>quarkus-test-keycloak</alias>
168170
<run>
169171
<ports>
170172
<port>8180:8080</port>
171173
</ports>
172174
<env>
173-
<KEYCLOAK_USER>admin</KEYCLOAK_USER>
174-
<KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
175+
<KC_BOOTSTRAP_ADMIN_USERNAME>admin</KC_BOOTSTRAP_ADMIN_USERNAME>
176+
<KC_BOOTSTRAP_ADMIN_PASSWORD>admin</KC_BOOTSTRAP_ADMIN_PASSWORD>
175177
</env>
178+
<cmd>
179+
<arg>start-dev</arg>
180+
</cmd>
176181
<log>
177182
<prefix>Keycloak:</prefix>
178183
<date>default</date>

‎extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Arrays;
55
import java.util.Collections;
66
import java.util.HashMap;
7+
import java.util.List;
78
import java.util.Map;
89

910
import org.keycloak.representations.AccessTokenResponse;
@@ -64,6 +65,7 @@ private static RealmRepresentation createRealm(String name) {
6465
realm.setRefreshTokenMaxReuse(0);
6566
realm.setDefaultGroups(Arrays.asList("user"));
6667
realm.setDefaultRoles(Arrays.asList("user"));
68+
realm.setRequiredActions(List.of());
6769

6870
return realm;
6971
}

‎extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyStoreManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Arrays;
55
import java.util.Collections;
66
import java.util.HashMap;
7+
import java.util.List;
78
import java.util.Map;
89

910
import org.keycloak.representations.AccessTokenResponse;
@@ -64,6 +65,7 @@ private static RealmRepresentation createRealm(String name) {
6465
realm.setRefreshTokenMaxReuse(0);
6566
realm.setDefaultGroups(Arrays.asList("user"));
6667
realm.setDefaultRoles(Arrays.asList("user"));
68+
realm.setRequiredActions(List.of());
6769

6870
return realm;
6971
}

0 commit comments

Comments
 (0)