Create a relase for keycloak 12.0.0

tidepool-org · Dec 18, 2020 · 51fbb85 · 51fbb85
1 parent 505827b
commit 51fbb85
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This project contains multiple custom extensions that we use in our Keycloak dep
 
 ### Packaging artifacts
 
-Artifacts are packaged using maven. If an extensions depends on a library that's not provided by keycloak it should be deployed as an ear. 
+Artifacts are packaged using maven. If an extension depends on a library that's not provided by keycloak it should be deployed as an ear. 
 To build all artifacts use the following command:
 ```
 ./mvnw clean compile package

diff --git a/admin/pom.xml b/admin/pom.xml
@@ -24,7 +24,7 @@
         <maven.compiler.target>11</maven.compiler.target>
 
         <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-parent -->
-        <keycloak.version>11.0.2</keycloak.version>
+        <keycloak.version>12.0.0</keycloak.version>
         <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <!-- https://mvnrepository.com/artifact/org.wildfly.plugins/wildfly-maven-plugin -->

diff --git a/admin/src/main/java/org/tidepool/keycloak/extensions/resource/AdminResource.java b/admin/src/main/java/org/tidepool/keycloak/extensions/resource/AdminResource.java
@@ -33,8 +33,7 @@ public abstract class AdminResource {
     protected AdminPermissionEvaluator auth;
 
     protected void setup() {
-        AppAuthManager authManager = new AppAuthManager();
-        String tokenString = authManager.extractAuthorizationHeaderToken(headers);
+        String tokenString = AppAuthManager.extractAuthorizationHeaderToken(headers);
         if (tokenString == null) throw new NotAuthorizedException("Bearer");
         AccessToken token;
         try {
@@ -53,7 +52,10 @@ protected void setup() {
 
         // Temporarily set the realm in the context to the admin realm to make sure we have a valid admin token
         session.getContext().setRealm(realm);
-        AuthenticationManager.AuthResult authResult = authManager.authenticateBearerToken(session, realm);
+
+        var authenticator = new AppAuthManager.BearerTokenAuthenticator(session);
+        authenticator.setRealm(realm);
+        AuthenticationManager.AuthResult authResult = authenticator.authenticate();
         if (authResult == null) {
             throw new NotAuthorizedException("Bearer");
         }

diff --git a/jmx-metrics-ear/pom.xml b/jmx-metrics-ear/pom.xml
@@ -24,7 +24,7 @@
         <maven.compiler.target>11</maven.compiler.target>
 
         <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-parent -->
-        <keycloak.version>11.0.2</keycloak.version>
+        <keycloak.version>12.0.0</keycloak.version>
         <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <!-- https://mvnrepository.com/artifact/org.wildfly.plugins/wildfly-maven-plugin -->

diff --git a/jmx-metrics/pom.xml b/jmx-metrics/pom.xml
@@ -23,7 +23,7 @@
         <maven.compiler.target>11</maven.compiler.target>
 
         <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-parent -->
-        <keycloak.version>11.0.2</keycloak.version>
+        <keycloak.version>12.0.0</keycloak.version>
         <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <!-- https://mvnrepository.com/artifact/org.wildfly.plugins/wildfly-maven-plugin -->

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <name>Keycloak Extensions</name>
 
     <properties>
-        <extensions-version>0.0.6-SNAPSHOT</extensions-version>
+        <extensions-version>0.0.7-SNAPSHOT</extensions-version>
     </properties>
 
     <modules>