fix(deps): update dependency org.keycloak:keycloak-admin-client to v20 (

#390) * fix(deps): update dependency org.keycloak:keycloak-admin-client to v20 * chore: guava not used * chore: unmaintained plugin removed Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michal Augustýn <[email protected]>
avast · Nov 8, 2022 · a9a3639 · a9a3639
1 parent 5b94184
commit a9a3639
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'com.github.sherter.google-java-format' version '0.9' apply false
     id 'com.google.protobuf' version '0.9.1' apply false
     id 'com.avast.gradle.docker-compose' version '0.16.9' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
@@ -26,7 +25,6 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
-    apply plugin: 'com.github.sherter.google-java-format'
 
     sourceCompatibility = JavaVersion.VERSION_1_8
 

diff --git a/keycloak/build.gradle b/keycloak/build.gradle
@@ -25,7 +25,7 @@ protobuf {
 
 dependencies {
     api project(':core')
-    api 'org.keycloak:keycloak-admin-client:19.0.3'
+    api 'org.keycloak:keycloak-admin-client:20.0.1'
     api 'org.bouncycastle:bcprov-jdk15on:1.70'
     api 'com.typesafe:config:1.4.2'
 

diff --git a/keycloak/src/main/java/com/avast/grpc/jwt/keycloak/server/KeycloakJwtTokenParser.java b/keycloak/src/main/java/com/avast/grpc/jwt/keycloak/server/KeycloakJwtTokenParser.java
@@ -1,11 +1,11 @@
 package com.avast.grpc.jwt.keycloak.server;
 
 import com.avast.grpc.jwt.server.JwtTokenParser;
-import com.google.common.base.Strings;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.stream.Collectors;
+
 import org.keycloak.TokenVerifier;
 import org.keycloak.common.VerificationException;
 import org.keycloak.constants.ServiceUrlConstants;
@@ -63,10 +63,10 @@ protected TokenVerifier<AccessToken> createTokenVerifier(String jwtToken)
       throws VerificationException {
     TokenVerifier<AccessToken> verifier =
         TokenVerifier.create(jwtToken, AccessToken.class).withChecks(checks);
-    if (!Strings.isNullOrEmpty(expectedAudience)) {
+    if (expectedAudience != null && !expectedAudience.isEmpty()) {
       verifier = verifier.audience(expectedAudience);
     }
-    if (!Strings.isNullOrEmpty(expectedIssuedFor)) {
+    if (expectedIssuedFor != null && !expectedIssuedFor.isEmpty()) {
       verifier = verifier.issuedFor(expectedIssuedFor);
     }
     verifier.publicKey(publicKeyProvider.get(verifier.getHeader().getKeyId()));