From ccf82654372943a169c700ce5d9f7392c1a779a6 Mon Sep 17 00:00:00 2001
From: Martin Besozzi <embesozzi@gmail.com>
Date: Fri, 28 Jun 2024 21:52:36 -0300
Subject: [PATCH] feat: Update Keycloak to v25.0.1 and OpenFGA platform to
 v1.5.5

---
 docker-compose.yml                                        | 6 +++---
 pom.xml                                                   | 8 ++++----
 .../keycloak/service/OpenFgaClientHandler.java            | 2 +-
 .../com/twogenidentity/keycloak/utils/OpenFgaHelper.java  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d6f175e..4f11181 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     ports:
       - 5433:5432
   keycloak:
-    image: quay.io/keycloak/keycloak:19.0.2
+    image: quay.io/keycloak/keycloak:25.0.1
     container_name: keycloak
     command:
       - start-dev
@@ -78,7 +78,7 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-    image: openfga/openfga:v1.3.1
+    image: openfga/openfga:v1.5.5
     container_name: migrate
     environment:
       - OPENFGA_DATASTORE_ENGINE=postgres
@@ -91,7 +91,7 @@ services:
     depends_on:
       migrate:
         condition: service_completed_successfully
-    image: openfga/openfga:v1.3.1
+    image: openfga/openfga:v1.5.5
     container_name: openfga
     command: run
     environment:
diff --git a/pom.xml b/pom.xml
index ccdb03f..cf74525 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,9 @@
 	<version>1.0.1</version>
 
 	<properties>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-		<keycloak.version>19.0.0</keycloak.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<keycloak.version>25.0.1</keycloak.version>
 		<jackson.version>2.15.2</jackson.version>
     	<jackson.databind.version>2.15.2</jackson.databind.version>
 		<junit.version>5.8.1</junit.version>
@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>dev.openfga</groupId>
 			<artifactId>openfga-sdk</artifactId>
-			<version>0.1.0</version>
+			<version>0.5.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/com/twogenidentity/keycloak/service/OpenFgaClientHandler.java b/src/main/java/com/twogenidentity/keycloak/service/OpenFgaClientHandler.java
index a9c10b0..752a5c8 100644
--- a/src/main/java/com/twogenidentity/keycloak/service/OpenFgaClientHandler.java
+++ b/src/main/java/com/twogenidentity/keycloak/service/OpenFgaClientHandler.java
@@ -1,8 +1,8 @@
 package com.twogenidentity.keycloak.service;
 
 import com.twogenidentity.keycloak.utils.OpenFgaHelper;
-import dev.openfga.sdk.api.client.ClientWriteRequest;
 import dev.openfga.sdk.api.client.OpenFgaClient;
+import dev.openfga.sdk.api.client.model.ClientWriteRequest;
 import dev.openfga.sdk.api.configuration.ClientConfiguration;
 import dev.openfga.sdk.api.configuration.ClientWriteOptions;
 import dev.openfga.sdk.api.model.*;
diff --git a/src/main/java/com/twogenidentity/keycloak/utils/OpenFgaHelper.java b/src/main/java/com/twogenidentity/keycloak/utils/OpenFgaHelper.java
index fb16b9a..f9d3a6e 100644
--- a/src/main/java/com/twogenidentity/keycloak/utils/OpenFgaHelper.java
+++ b/src/main/java/com/twogenidentity/keycloak/utils/OpenFgaHelper.java
@@ -1,8 +1,8 @@
 package com.twogenidentity.keycloak.utils;
 
 import com.twogenidentity.keycloak.event.EventParser;
-import dev.openfga.sdk.api.client.ClientTupleKey;
-import dev.openfga.sdk.api.client.ClientWriteRequest;
+import dev.openfga.sdk.api.client.model.ClientTupleKey;
+import dev.openfga.sdk.api.client.model.ClientWriteRequest;
 import dev.openfga.sdk.api.model.AuthorizationModel;
 import dev.openfga.sdk.api.model.RelationReference;
 import dev.openfga.sdk.api.model.TypeDefinition;