Support Keycloak 21.x

Author: wouterh-dev

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:20.0.3
+FROM quay.io/keycloak/keycloak:21.1.1
 
 #COPY target/lib/*.jar ./providers/
 COPY target/keycloak-spi-trusted-device-*-SNAPSHOT.jar /opt/keycloak/providers/keycloak-spi-trusted-device.jar

pom.xml

@@ -15,7 +15,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <keycloak.version>20.0.3</keycloak.version>
+    <keycloak.version>21.1.1</keycloak.version>
     <lombok.version>1.18.24</lombok.version>
     <reproducible-build-maven-plugin.version>0.13</reproducible-build-maven-plugin.version>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>

realm-test.json

@@ -1731,12 +1731,12 @@
     "cibaInterval": "5",
     "realmReusableOtpCode": "false"
   },
-  "keycloakVersion": "20.0.3",
+  "keycloakVersion": "21.1.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []
   },
   "clientPolicies": {
     "policies": []
   }
-}
+}

src/main/java/nl/wouterh/keycloak/trusteddevice/util/TrustedDeviceToken.java

@@ -50,12 +50,13 @@ private static void addCookie(KeycloakSession session, RealmModel realm, String
         maxAge,
         secure,
         true,
-        sameSiteValue
+        sameSiteValue,
+        session
     );
   }
 
   public static TrustedDeviceToken getCookie(KeycloakSession session) {
-    Set<String> cookieValues = CookieHelper.getCookieValue(COOKIE_NAME);
+    Set<String> cookieValues = CookieHelper.getCookieValue(session, COOKIE_NAME);
     long time = Time.currentTime();
 
     for (String cookieValue : cookieValues) {