From f04877744da929a38d78e4a8d1c869d23953fae6 Mon Sep 17 00:00:00 2001
From: Reda Bourial <reda.bourial@gmail.com>
Date: Thu, 21 Mar 2024 13:17:29 +0100
Subject: [PATCH] Updated to keycloak 24 (#70)

* updated to keycloak 24

* fixed Cors class not found

* fixed depreciated getCookie

* fixed token host bug on keycloak 24

* Revert "fixed token host bug on keycloak 24"

This reverts commit 6fe08f9c6ec1d0d2f54b682902ff580643f26f73.

* added reusable parameter to README

* fixed typo in readme
---
 README.md                                                  | 1 +
 pom.xml                                                    | 2 +-
 .../token/MagicLinkContinuationLinkActionTokenHandler.java | 7 +------
 .../io/phasetwo/keycloak/magic/resources/CorsResource.java | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 24046cf..26fbfc7 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ Parameters:
 | `nonce` | N | | OIDC `nonce` variable. |
 | `state` | N | | OIDC `state` variable. |
 | `remember_me` | N | false | If the user is treated as if they had checked "Remember Me" on login. Requires that it is enabled in the Realm. |
+| `reusable` | N | true | If the token can be reused multiple times during its validity |
 
 Sample request (replace your access token):
 ```
diff --git a/pom.xml b/pom.xml
index 317e6f9..1804865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <main.java.package>io.phasetwo.keycloak.magic</main.java.package>
     <junit.version>4.13.2</junit.version>
-    <keycloak.version>23.0.3</keycloak.version>
+    <keycloak.version>24.0.0</keycloak.version>
     <lombok.version>1.18.30</lombok.version>
     <auto-service.version>1.1.1</auto-service.version>
     <ossrh.url>https://s01.oss.sonatype.org</ossrh.url>
diff --git a/src/main/java/io/phasetwo/keycloak/magic/auth/token/MagicLinkContinuationLinkActionTokenHandler.java b/src/main/java/io/phasetwo/keycloak/magic/auth/token/MagicLinkContinuationLinkActionTokenHandler.java
index d6af72b..c020721 100644
--- a/src/main/java/io/phasetwo/keycloak/magic/auth/token/MagicLinkContinuationLinkActionTokenHandler.java
+++ b/src/main/java/io/phasetwo/keycloak/magic/auth/token/MagicLinkContinuationLinkActionTokenHandler.java
@@ -1,7 +1,6 @@
 package io.phasetwo.keycloak.magic.auth.token;
 
 import static io.phasetwo.keycloak.magic.auth.util.MagicLinkConstants.SESSION_CONFIRMED;
-import static org.keycloak.services.util.CookieHelper.getCookie;
 
 import io.phasetwo.keycloak.magic.auth.model.MagicLinkContinuationBean;
 import io.phasetwo.keycloak.magic.auth.util.MagicLinkConstants;
@@ -58,11 +57,7 @@ public Response handleToken(
           rootAuthenticationSession.getAuthenticationSession(client, token.getTabId());
       if (authenticationFlowSession != null) {
         authenticationFlowSession.setAuthNote(SESSION_CONFIRMED, "true");
-
-        Cookie cookie =
-            getCookie(
-                session.getContext().getRequestHeaders().getCookies(),
-                MagicLinkConstants.AUTH_SESSION_ID);
+        Cookie cookie = session.getContext().getRequestHeaders().getCookies().get(MagicLinkConstants.AUTH_SESSION_ID);
 
         boolean sameBrowser = cookie != null && cookie.getValue().equals(token.getSessionId());
         MagicLinkContinuationBean magicLinkContinuationBean =
diff --git a/src/main/java/io/phasetwo/keycloak/magic/resources/CorsResource.java b/src/main/java/io/phasetwo/keycloak/magic/resources/CorsResource.java
index 838db9f..e46d412 100644
--- a/src/main/java/io/phasetwo/keycloak/magic/resources/CorsResource.java
+++ b/src/main/java/io/phasetwo/keycloak/magic/resources/CorsResource.java
@@ -6,7 +6,7 @@
 import org.keycloak.http.HttpRequest;
 import org.keycloak.http.HttpResponse;
 import org.keycloak.models.KeycloakSession;
-import org.keycloak.services.resources.Cors;
+import org.keycloak.services.cors.Cors;
 import org.keycloak.services.resources.admin.AdminAuth;
 
 @JBossLog