From dfe07713559f73e3d200bc85f9cec9f79dd8718a Mon Sep 17 00:00:00 2001
From: Jorge Fernandez Ruiz <jorgefernandez@ibermutua.es>
Date: Mon, 13 Feb 2023 11:27:38 +0100
Subject: [PATCH 1/2] downgrade to java 8

---
 autoconfigure/pom.xml | 4 ++--
 demo/pom.xml          | 6 +++---
 starter/pom.xml       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/autoconfigure/pom.xml b/autoconfigure/pom.xml
index 0af15a6..2a1af14 100644
--- a/autoconfigure/pom.xml
+++ b/autoconfigure/pom.xml
@@ -60,8 +60,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>15</maven.compiler.source>
-        <maven.compiler.target>15</maven.compiler.target>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
 
         <spring-security-oauth2-resource-server.version>5.4.6</spring-security-oauth2-resource-server.version>
         <oauth2-oidc-sdk.version>6.23</oauth2-oidc-sdk.version>
diff --git a/demo/pom.xml b/demo/pom.xml
index c3349cc..c75caf4 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -45,10 +45,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>15</maven.compiler.source>
-        <maven.compiler.target>15</maven.compiler.target>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
 
-        <java.version>15</java.version>
+        <java.version>8</java.version>
 
         <multi-tenant-oauth2-resource-server-spring-boot-starter.version>1.0.4-beta</multi-tenant-oauth2-resource-server-spring-boot-starter.version>
     </properties>
diff --git a/starter/pom.xml b/starter/pom.xml
index 89d5ff5..c91d559 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -64,8 +64,8 @@
     </parent>
 
     <properties>
-        <maven.compiler.source>15</maven.compiler.source>
-        <maven.compiler.target>15</maven.compiler.target>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
 
         <oauth2-oidc-sdk.version>6.23</oauth2-oidc-sdk.version>
         <multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>1.0.4-beta</multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>

From 480e5650deb074a3ba3ea1d6ed6dc847421fdaec Mon Sep 17 00:00:00 2001
From: Jorge Fernandez Ruiz <jorgefernandez@ibermutua.es>
Date: Wed, 29 Mar 2023 17:09:52 +0200
Subject: [PATCH 2/2] fix error no jwt tenant provide.

---
 autoconfigure/pom.xml                                       | 4 ++--
 .../resolver/jwt/JwtAuthenticationManagerResolver.java      | 6 ++++--
 demo/pom.xml                                                | 6 +++---
 starter/pom.xml                                             | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/autoconfigure/pom.xml b/autoconfigure/pom.xml
index 2a1af14..0af15a6 100644
--- a/autoconfigure/pom.xml
+++ b/autoconfigure/pom.xml
@@ -60,8 +60,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
 
         <spring-security-oauth2-resource-server.version>5.4.6</spring-security-oauth2-resource-server.version>
         <oauth2-oidc-sdk.version>6.23</oauth2-oidc-sdk.version>
diff --git a/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java b/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java
index 8cd81c8..44f8a15 100644
--- a/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java
+++ b/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java
@@ -42,12 +42,14 @@ public static class Builder {
         private AuthenticationManagerResolver<HttpServletRequest> trustedIssuerResolver;
 
         public Builder withPublicKeyResolver(Map<String, RSAPublicKey> publicKeys) {
-            this.publicKeyResolver = new JwtIssuerAuthenticationManagerResolver(new PublicKeyJwtAuthenticationManagerResolver(publicKeys));
+            if (publicKeys != null && !publicKeys.isEmpty())
+                this.publicKeyResolver = new JwtIssuerAuthenticationManagerResolver(new PublicKeyJwtAuthenticationManagerResolver(publicKeys));
             return this;
         }
 
         public Builder withTrustedIssuerResolver(Collection<String> trustedIssuers) {
-            this.trustedIssuerResolver = new JwtIssuerAuthenticationManagerResolver(trustedIssuers);
+            if (trustedIssuers != null && !trustedIssuers.isEmpty())
+                this.trustedIssuerResolver = new JwtIssuerAuthenticationManagerResolver(trustedIssuers);
             return this;
         }
 
diff --git a/demo/pom.xml b/demo/pom.xml
index c75caf4..c3349cc 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -45,10 +45,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
 
-        <java.version>8</java.version>
+        <java.version>15</java.version>
 
         <multi-tenant-oauth2-resource-server-spring-boot-starter.version>1.0.4-beta</multi-tenant-oauth2-resource-server-spring-boot-starter.version>
     </properties>
diff --git a/starter/pom.xml b/starter/pom.xml
index c91d559..89d5ff5 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -64,8 +64,8 @@
     </parent>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
 
         <oauth2-oidc-sdk.version>6.23</oauth2-oidc-sdk.version>
         <multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>1.0.4-beta</multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>