From 3403e2f326963d60fff32ed61848f494f287bd5f Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Thu, 10 Oct 2024 08:42:11 +0200
Subject: [PATCH] keycloak: Upgrade to 26.0

---
 modules/keycloak/default.nix           | 17 ++---------------
 modules/keycloak/keycloak-admin-ui.nix |  4 ++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/modules/keycloak/default.nix b/modules/keycloak/default.nix
index 8a5dd51..03502ca 100644
--- a/modules/keycloak/default.nix
+++ b/modules/keycloak/default.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -22,22 +21,10 @@ in
         hostname = "id.datarift.nl";
         http-host = "127.0.0.1";
         http-port = 8081;
-        proxy = "edge";
+        http-enabled = true;
+        proxy-headers = "xforwarded";
         features = "docker";
       };
-
-      plugins = [
-        (pkgs.callPackage ./keycloak-orgs.nix {
-          inherit (pkgs) fetchFromGitHub;
-          inherit (pkgs.maven) buildMavenPackage;
-        })
-        (pkgs.callPackage ./keycloak-admin-ui.nix {
-          inherit (pkgs) fetchFromGitHub;
-          inherit (pkgs.maven) buildMavenPackage;
-          keycloak = config.services.keycloak.package;
-        })
-        (pkgs.callPackage ./phasetwo-admin-ui.nix { inherit (pkgs) stdenv fetchFromGitHub; })
-      ];
     };
 
     services.caddy = {
diff --git a/modules/keycloak/keycloak-admin-ui.nix b/modules/keycloak/keycloak-admin-ui.nix
index 5fc5746..11b2686 100644
--- a/modules/keycloak/keycloak-admin-ui.nix
+++ b/modules/keycloak/keycloak-admin-ui.nix
@@ -14,12 +14,12 @@ buildMavenPackage {
     owner = "keycloak";
     repo = "keycloak";
     rev = version;
-    hash = "sha256-OuqECd4Mru6P4WDHf+79C3wSL7H6GvDMZoX70Zim1FI=";
+    hash = "sha256-DQqmgINLQ6wYJPuvYCaQ402U0wVvX0ZRC55ukeoLtYA=";
   };
 
   sourceRoot = "source/integration/admin-client";
 
-  mvnHash = "sha256-uFqCrPTuXZJTZ3cIBqJPKbf0nkWvdtdTeVV8lMYW1xs=";
+  mvnHash = "sha256-vwQ4X01pWX1n+o3RVWasbpAlAVuqzwn5xqh4KNiXzQA=";
   # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
   installPhase = ''