Post logout route

build.gradle

@@ -10,11 +10,11 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.51.0'
     id 'com.google.cloud.tools.jib' version '3.4.3' apply false
     id 'org.sonarqube' version '5.1.0.4882'
-    id 'pl.allegro.tech.build.axion-release' version '1.18.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.18.13'
 }
 
 wrapper {
-    gradleVersion = '8.8'
+    gradleVersion = '8.10.2'
     distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -42,17 +42,17 @@ allprojects {
 }
 
 ext {
-    assertj_version = '3.26.0'
+    assertj_version = '3.26.3'
     jjwt_version = '0.12.6'
     jsr305_version = '3.0.2'
     junit4_version = '4.13.2'
-    junit5_version = '5.10.3'
-    keycloak_version = '25.0.1'
-    mockito_version = '5.12.0'
+    junit5_version = '5.11.2'
+    keycloak_version = '26.0.0'
+    mockito_version = '5.14.2'
     picocli_version = '4.7.6'
-    restassured_version = '5.4.0'
-    slf4j_version = '2.0.13'
-    vertx_version = '4.5.8'
+    restassured_version = '5.5.0'
+    slf4j_version = '2.0.16'
+    vertx_version = '4.5.10'
 
     license_name = 'The Apache License, Version 2.0'
     license_url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'

example-backend/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '3.3.1'
+        springBootVersion = '3.3.4'
     }
     repositories {
         mavenCentral()

example-frontend-react/build.gradle

@@ -1,7 +1,7 @@
 import static groovy.io.FileType.FILES
 
 plugins {
-    id 'com.github.node-gradle.node' version '7.0.2'
+    id 'com.github.node-gradle.node' version '7.1.0'
 }
 
 def nodeDir = 'bin/nodejs'

example-frontend-react/package.json

@@ -4,8 +4,8 @@
   "private": true,
   "license": "Apache-2.0",
   "dependencies": {
-    "axios": "^1.7.4",
-    "keycloak-js": "^25.0.1",
+    "axios": "^1.7.7",
+    "keycloak-js": "^26.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-scripts": "5.0.1"
@@ -29,7 +29,7 @@
     "not op_mini all"
   ],
   "devDependencies": {
-    "cypress": "^13.13.0",
-    "cypress-keycloak": "^2.0.1"
+    "cypress": "^13.15.0",
+    "cypress-keycloak": "^2.0.2"
   }
 }

example-frontend-react/yarn.lock

@@ -2258,25 +2258,25 @@
   resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4"
   integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==
 
-"@cypress/request@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960"
-  integrity sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==
+"@cypress/request@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.5.tgz#d893a6e68ce2636c085fcd8d7283c3186499ba63"
+  integrity sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
     caseless "~0.12.0"
     combined-stream "~1.0.6"
     extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
+    form-data "~4.0.0"
+    http-signature "~1.4.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "6.10.4"
+    qs "6.13.0"
     safe-buffer "^5.1.2"
     tough-cookie "^4.1.3"
     tunnel-agent "^0.6.0"
@@ -3710,10 +3710,10 @@ axe-core@^4.3.5:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
   integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
 
-axios@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
-  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
+axios@^1.7.7:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
+  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -4330,7 +4330,7 @@ colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4726,20 +4726,20 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-cypress-keycloak@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cypress-keycloak/-/cypress-keycloak-2.0.1.tgz#0e8c762debfefd9d99a4ef06692250d076cc39fa"
-  integrity sha512-RzHi0YNle8Ft0hMUpCceCsRbNOON9jtAPNWD/9NE+3egCx/pSMJY7RNuL1oGDyzdjjE5WvOU6llC3uYBKrFtJQ==
+cypress-keycloak@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cypress-keycloak/-/cypress-keycloak-2.0.2.tgz#fd76cc276a325182a7313e9456bc5319724201ae"
+  integrity sha512-pHCjn68pai6y3MPuaM7c6UEidIfaXfl2+4WKhQ/8wgprQb7YlPcuBI1txBC477O2OFLx9ii1XlSXXq7fUP8ZAg==
   dependencies:
     base64-js "^1.5.1"
     js-sha256 "^0.9.0"
 
-cypress@^13.13.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.13.0.tgz#52b2914c0c1c7d8a51ec2e3df18e13995da95951"
-  integrity sha512-ou/MQUDq4tcDJI2FsPaod2FZpex4kpIK43JJlcBgWrX8WX7R/05ZxGTuxedOuZBfxjZxja+fbijZGyxiLP6CFA==
+cypress@^13.15.0:
+  version "13.15.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.0.tgz#5eca5387ef34b2e611cfa291967c69c2cd39381d"
+  integrity sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==
   dependencies:
-    "@cypress/request" "^3.0.0"
+    "@cypress/request" "^3.0.4"
     "@cypress/xvfb" "^1.2.4"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
@@ -5976,13 +5976,13 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+form-data@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
+  integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.6"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
 [email protected]:
@@ -6486,14 +6486,14 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
+http-signature@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
+  integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^2.0.2"
-    sshpk "^1.14.1"
+    sshpk "^1.18.0"
 
 https-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -7426,11 +7426,6 @@ jest@^27.4.3:
     import-local "^3.0.2"
     jest-cli "^27.4.7"
 
-js-sha256@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576"
-  integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q==
-
 js-sha256@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
@@ -7593,18 +7588,10 @@ jsx-ast-utils@^3.2.1:
     array-includes "^3.1.3"
     object.assign "^4.1.2"
 
-jwt-decode@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
-  integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
-
-keycloak-js@^25.0.1:
-  version "25.0.1"
-  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-25.0.1.tgz#6197e1184dd86ecc1b55f8b19df0f61c466a00c0"
-  integrity sha512-ns5sKQ5Iz3UyVGIKq2XBBXNZTlTCg9bzybR+JB2Vn+fDHIo9EGgAY4kzrBWMwbeFuegY+qJwGs05N+W9jgY9tg==
-  dependencies:
-    js-sha256 "^0.11.0"
-    jwt-decode "^4.0.0"
+keycloak-js@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-26.0.1.tgz#02042600c6cb8146389785bc5ce89b6c1bf92063"
+  integrity sha512-Fhn7a9FVKTpno2yfhL6/eiQrmEgBkiM+toVBJ1+g8kasG6CeiMKnI93byL5W8W3M7Ld3Im1QD3kuL/z4vJHGcg==
 
 kind-of@^6.0.2:
   version "6.0.3"
@@ -9187,13 +9174,6 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-[email protected]:
-  version "6.10.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.4.tgz#6a3003755add91c0ec9eacdc5f878b034e73f9e7"
-  integrity sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==
-  dependencies:
-    side-channel "^1.0.4"
-
 [email protected]:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
@@ -10055,10 +10035,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.14.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+sshpk@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"

example-integration-docker/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id 'com.avast.gradle.docker-compose' version '0.17.7'
+  id 'com.avast.gradle.docker-compose' version '0.17.10'
 }
 
 composeUp {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mock/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     testImplementation "io.rest-assured:rest-assured:$restassured_version"
     // required to mock RoutingContext
     testImplementation "io.vertx:vertx-codegen:$vertx_version"
-    testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:3.4.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:3.4.1'
     testImplementation "org.assertj:assertj-core:$assertj_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api"
     testImplementation "org.junit.jupiter:junit-jupiter-params"
@@ -40,7 +40,7 @@ tasks.register('addResources', Copy) {
     // make sure to fail if both JARs contain a NOTICE, then we need to merge the files somehow ...
     duplicatesStrategy = DuplicatesStrategy.FAIL
     from files(tarTree(configurations.jsResourceJar.singleFile)) {
-        include '/package/dist/keycloak.js'
+        include '/package/lib/keycloak.js'
         include '/META-INF/NOTICE'
     }
     from files(zipTree(configurations.htmlResourceJar.singleFile)) {

mock/src/main/java/com/tngtech/keycloakmock/impl/UrlConfiguration.java

@@ -1,6 +1,7 @@
 package com.tngtech.keycloakmock.impl;
 
 import com.tngtech.keycloakmock.api.ServerConfig;
+import io.vertx.ext.web.RoutingContext;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
@@ -60,6 +61,13 @@ public UrlConfiguration forRequestContext(
     return new UrlConfiguration(this, requestHost, requestRealm);
   }
 
+  @Nonnull
+  public UrlConfiguration forRequestContext(RoutingContext routingContext) {
+    String requestHostname = routingContext.request().getHeader("Host");
+    String requestRealm = routingContext.pathParam("realm");
+    return new UrlConfiguration(this, requestHostname, requestRealm);
+  }
+
   @Nonnull
   URI getBaseUrl() {
     try {

mock/src/main/java/com/tngtech/keycloakmock/impl/dagger/ServerModule.java

@@ -4,15 +4,13 @@
 import com.tngtech.keycloakmock.impl.UrlConfiguration;
 import com.tngtech.keycloakmock.impl.handler.AuthenticationRoute;
 import com.tngtech.keycloakmock.impl.handler.CommonHandler;
-import com.tngtech.keycloakmock.impl.handler.DelegationRoute;
 import com.tngtech.keycloakmock.impl.handler.FailureHandler;
 import com.tngtech.keycloakmock.impl.handler.IFrameRoute;
 import com.tngtech.keycloakmock.impl.handler.JwksRoute;
 import com.tngtech.keycloakmock.impl.handler.LoginRoute;
 import com.tngtech.keycloakmock.impl.handler.LogoutRoute;
 import com.tngtech.keycloakmock.impl.handler.OptionalBasicAuthHandler;
 import com.tngtech.keycloakmock.impl.handler.OutOfBandLoginRoute;
-import com.tngtech.keycloakmock.impl.handler.RequestUrlConfigurationHandler;
 import com.tngtech.keycloakmock.impl.handler.ResourceFileHandler;
 import com.tngtech.keycloakmock.impl.handler.TokenRoute;
 import com.tngtech.keycloakmock.impl.handler.WellKnownRoute;
@@ -21,6 +19,7 @@
 import dagger.Provides;
 import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.net.JksOptions;
@@ -79,7 +78,7 @@ ResourceFileHandler provideCookie2Handler() {
   @Singleton
   @Named("keycloakJs")
   ResourceFileHandler provideKeycloakJsHandler() {
-    return new ResourceFileHandler("/package/dist/keycloak.js");
+    return new ResourceFileHandler("/package/lib/keycloak.js");
   }
 
   @Provides
@@ -123,7 +122,7 @@ HttpServerOptions provideHttpServerOptions(
     if (defaultConfiguration.getProtocol().isTls()) {
       options
           .setSsl(true)
-          .setKeyStoreOptions(new JksOptions().setValue(keyStoreBuffer.get()).setPassword(""));
+          .setKeyCertOptions(new JksOptions().setValue(keyStoreBuffer.get()).setPassword(""));
     }
     return options;
   }
@@ -133,7 +132,6 @@ HttpServerOptions provideHttpServerOptions(
   Router provideRouter(
       @Nonnull UrlConfiguration defaultConfiguration,
       @Nonnull Vertx vertx,
-      @Nonnull RequestUrlConfigurationHandler requestUrlConfigurationHandler,
       @Nonnull CommonHandler commonHandler,
       @Nonnull FailureHandler failureHandler,
       @Nonnull JwksRoute jwksRoute,
@@ -146,14 +144,12 @@ Router provideRouter(
       @Nonnull @Named("cookie1") ResourceFileHandler thirdPartyCookies1Route,
       @Nonnull @Named("cookie2") ResourceFileHandler thirdPartyCookies2Route,
       @Nonnull LogoutRoute logoutRoute,
-      @Nonnull DelegationRoute delegationRoute,
       @Nonnull OutOfBandLoginRoute outOfBandLoginRoute,
       @Nonnull @Named("keycloakJs") ResourceFileHandler keycloakJsRoute) {
     UrlConfiguration routing = defaultConfiguration.forRequestContext(null, ":realm");
     Router router = Router.router(vertx);
     router
         .route()
-        .handler(requestUrlConfigurationHandler)
         .handler(commonHandler)
         .failureHandler(failureHandler)
         .failureHandler(ErrorHandler.create(vertx));
@@ -176,8 +172,11 @@ Router provideRouter(
     router
         .get(routing.getOpenIdPath("3p-cookies/step2.html").getPath())
         .handler(thirdPartyCookies2Route);
-    router.get(routing.getEndSessionEndpoint().getPath()).handler(logoutRoute);
-    router.get(routing.getOpenIdPath("delegated").getPath()).handler(delegationRoute);
+    router
+        .route(routing.getEndSessionEndpoint().getPath())
+        .method(HttpMethod.GET)
+        .method(HttpMethod.POST)
+        .handler(logoutRoute);
     router.get(routing.getOutOfBandLoginLoginEndpoint().getPath()).handler(outOfBandLoginRoute);
     router.route("/auth/js/keycloak.js").handler(keycloakJsRoute);
     return router;