Merge branch 'main' into patch-1

Daniel-Boluda · web-flow · commit 22ba135c3d18 · 2025-01-16T12:15:28.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -38,7 +38,7 @@ body:
     label: Version
     description: |
       examples:
-        - **Keycloak**: 26.0.7
+        - **Keycloak**: 26.1.0
         - **This extension**: 26.0.0
     value: |
         - Keycloak:
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        keycloak_version: [ 25.0.6, 26.0.0, 26.0.1, 26.0.2, 26.0.4, 26.0.5, 26.0.6, 26.0.7, latest ]
+        keycloak_version: [ 25.0.6, 26.0.8, 26.1.0, latest ]
         keycloak_dist: [quarkus]
         experimental: [false]
         include:
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        keycloak_version: [ 21.0.2, 21.1.2, 22.0.5, 23.0.7, 24.0.5, 25.0.6, 26.0.0, 26.0.1, 26.0.2, 26.0.4, 26.0.5, 26.0.6, 26.0.7, latest, nightly ]
+        keycloak_version: [ 21.0.2, 21.1.2, 22.0.5, 23.0.7, 24.0.5, 25.0.6, 26.0.8, 26.1.0, latest, nightly ]
         extension_version: [ 20.0.1, 21.0.0, 22.0.0, 23.0.0, 24.0.0, 25.0.0, 26.0.0 ]
     name: Compatibility (KC ${{ matrix.keycloak_version }}, Extension ${{ matrix.extension_version }})
     steps:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,39 @@
+# Contributing
+
+I kindly ask anyone who wants to contribute to this project to follow some basic guidelines:
+
+1. Open a discussion around the change before contributing any code
+
+   https://github.com/sventorben/keycloak-restrict-client-auth/discussions/categories/ideas)
+2. Create a GitHub Issue with a good description associated with the PR
+4. One feature/change per PR
+5. One commit per PR 
+6. PR rebased on main (`git rebase`, not `git pull`) 
+7. Good descriptive [conventional commit message](https://www.conventionalcommits.org/en/v1.0.0/), with link to issue
+8. No changes to code not directly related to your PR
+9. Includes basic tests
+
+   Please do not add additional test frameworks without prior consultation
+10. Include some documentation/extend the README
+11. PR must pass DCO check
+
+## Sign off Your Work
+
+The Developer Certificate of Origin (DCO) is a lightweight way for contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project. Here is the full text of the [DCO](http://developercertificate.org/). Contributors must sign-off that they adhere to these requirements by adding a `Signed-off-by` line to commit messages.
+
+```text
+This is my commit message
+
+Signed-off-by: Random J Developer <random@developer.example.org>
+```
+
+See `git help commit`:
+
+```text
+-s, --signoff
+    Add Signed-off-by line by the committer at the end of the commit log
+    message. The meaning of a signoff depends on the project, but it typically
+    certifies that committer has the rights to submit this work under the same
+    license and agrees to a Developer Certificate of Origin (see
+    http://developercertificate.org/ for more information).
+```
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile2 b/Dockerfile2
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 This is a simple Keycloak authenticator to restrict user authorization on clients.
 
 ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/sventorben/keycloak-restrict-client-auth?sort=semver)
-![Keycloak Dependency Version](https://img.shields.io/badge/Keycloak-26.0.7-blue)
+![Keycloak Dependency Version](https://img.shields.io/badge/Keycloak-26.1.0-blue)
 ![GitHub Release Date](https://img.shields.io/github/release-date-pre/sventorben/keycloak-restrict-client-auth)
 ![Github Last Commit](https://img.shields.io/github/last-commit/sventorben/keycloak-restrict-client-auth)
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   keycloak:
     container_name: keycloak
-    image: quay.io/keycloak/keycloak:26.0.7
+    image: quay.io/keycloak/keycloak:26.1.0
     environment:
       KC_BOOTSTRAP_ADMIN_USERNAME: admin
       KC_BOOTSTRAP_ADMIN_PASSWORD: admin
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
         <maven.compiler.release>17</maven.compiler.release>
 
         <!-- For compilation -->
-        <version.keycloak>26.0.7</version.keycloak>
+        <version.keycloak>26.1.0</version.keycloak>
 
         <!-- For compatibility tests -->
         <keycloak.version>${version.keycloak}</keycloak.version>
diff --git a/src/test/java/de/sventorben/keycloak/authorization/client/ClientPolicyIT.java b/src/test/java/de/sventorben/keycloak/authorization/client/ClientPolicyIT.java
@@ -36,7 +36,7 @@ class ClientPolicyIT {
     private static final KeycloakContainer KEYCLOAK_CONTAINER = FullImageName.createContainer()
         .withExposedPorts(KEYCLOAK_HTTP_PORT)
         .withLogConsumer(new Slf4jLogConsumer(LOGGER).withSeparateOutputStreams())
-        .withRealmImportFile("/test-realm.json")
+        .withRealmImportFile("/test-realm-realm.json")
         .withStartupTimeout(Duration.ofSeconds(90));
 
     @BeforeAll
diff --git a/src/test/java/de/sventorben/keycloak/authorization/client/LoginIT.java b/src/test/java/de/sventorben/keycloak/authorization/client/LoginIT.java
@@ -35,7 +35,7 @@ class LoginIT {
     private static final KeycloakContainer KEYCLOAK_CONTAINER = FullImageName.createContainer()
         .withExposedPorts(KEYCLOAK_HTTP_PORT)
         .withLogConsumer(new Slf4jLogConsumer(LOGGER).withSeparateOutputStreams())
-        .withRealmImportFile("/test-realm.json")
+        .withRealmImportFile("/test-realm-realm.json")
         .withStartupTimeout(Duration.ofSeconds(90));
 
     @BeforeAll
diff --git a/src/test/resources/test-realm-realm.json b/src/test/resources/test-realm-realm.json
