Merge pull request #10 from mzlnk/tmp/release-1.0.3-beta

tmp/release-1.0.3-beta

Author: mzlnk

README.md

@@ -1,7 +1,7 @@
 # Multi-Tenant OAuth2 Resource Server Spring Boot Starter
 
 [![Licence: MIT](https://img.shields.io/badge/Licence-MIT-blue.svg)](https://shields.io/)
-[![Version: BETA-1.0](https://img.shields.io/badge/version-1.0--beta-yellow.svg)](https://shields.io/)
+[![Version: BETA-1.0](https://img.shields.io/badge/version-1.0.3--beta-yellow.svg)](https://shields.io/)
 [![Java : 15](https://img.shields.io/badge/Java-15-orange.svg)](https://jdk.java.net/15/)
 [![Open Source](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
 
@@ -18,7 +18,7 @@ in Spring Boot configuration file ;)
 🚧 The project is currently in BETA. There can be lack of some features or some bugs may still appear. However, we do our best to continuously improve
 and develop the starter ;)
 
-**Latest version:** 1.0.2-beta
+**Latest version:** 1.0.3-beta
 
 ## Getting started!
 
@@ -29,7 +29,7 @@ If you want to use the starter in your project - just include proper dependency
 <dependency>
   <groupId>io.mzlnk.springframework</groupId>
   <artifactId>multi-tenant-oauth2-resource-server-spring-boot-starter</artifactId>
-  <version>1.0.2-beta</version>
+  <version>1.0.3-beta</version>
 </dependency>
 ```
 

autoconfigure/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.mzlnk.springframework</groupId>
     <artifactId>multi-tenant-oauth2-resource-server-spring-boot-autoconfigure</artifactId>
-    <version>1.0.2-beta</version>
+    <version>1.0.3-beta</version>
     <packaging>jar</packaging>
 
     <name>multi-tenant-oauth2-resource-server-spring-boot-autoconfiguration</name>

autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/AutoConfiguration.java

@@ -42,7 +42,6 @@ public MultitenantAuthenticationManagerResolver multitenantAuthenticationManager
     }
 
     @Bean
-    @Order(1)
     public AuthenticationTenantContextFilter authenticationTenantContextFilter(MultitenantAuthenticationManagerResolver resolver) {
         return new AuthenticationTenantContextFilter(resolver);
     }

autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/context/AuthenticationTenantContextFilter.java

@@ -1,6 +1,7 @@
 package io.mzlnk.springframework.multitenant.oauth2.resourceserver.context;
 
 import io.mzlnk.springframework.multitenant.oauth2.resourceserver.resolver.MultitenantAuthenticationManagerResolver;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.server.resource.introspection.OAuth2IntrospectionAuthenticatedPrincipal;
@@ -14,8 +15,12 @@
 import java.net.URL;
 import java.util.Optional;
 
+import static io.mzlnk.springframework.multitenant.oauth2.resourceserver.context.AuthenticationTenantContextFilter.ORDER;
+
+@Order(ORDER)
 public class AuthenticationTenantContextFilter extends OncePerRequestFilter {
 
+    public static final int ORDER = 4000;
     private final MultitenantAuthenticationManagerResolver resolver;
 
     public AuthenticationTenantContextFilter(MultitenantAuthenticationManagerResolver resolver) {

autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java

@@ -52,7 +52,7 @@ public Builder withTrustedIssuerResolver(Collection<String> trustedIssuers) {
         }
 
         public JwtAuthenticationManagerResolver build() {
-            return new JwtAuthenticationManagerResolver(this.publicKeyResolver, this.trustedIssuerResolver);
+            return new JwtAuthenticationManagerResolver(this.trustedIssuerResolver, this.publicKeyResolver);
         }
 
     }

demo/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.mzlnk.springframework</groupId>
     <artifactId>multi-tenant-oauth2-resource-server-spring-boot-starter-demo</artifactId>
-    <version>1.0-beta</version>
+    <version>1.0.3-beta</version>
 
     <name>multi-tenant-oauth2-resource-server-spring-boot-starter-demo</name>
     <description>Sample demo for multi-tenant OAuth2 resource server Spring Boot starter</description>
@@ -50,7 +50,7 @@
 
         <java.version>15</java.version>
 
-        <multi-tenant-oauth2-resource-server-spring-boot-starter.version>1.0.2-beta</multi-tenant-oauth2-resource-server-spring-boot-starter.version>
+        <multi-tenant-oauth2-resource-server-spring-boot-starter.version>1.0.3-beta</multi-tenant-oauth2-resource-server-spring-boot-starter.version>
     </properties>
 
     <dependencies>

starter/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.mzlnk.springframework</groupId>
     <artifactId>multi-tenant-oauth2-resource-server-spring-boot-starter</artifactId>
-    <version>1.0.2-beta</version>
+    <version>1.0.3-beta</version>
     <packaging>jar</packaging>
 
     <name>multi-tenant-oauth2-resource-server-spring-boot-starter</name>
@@ -68,7 +68,7 @@
         <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.2-beta</multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>
+        <multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>1.0.3-beta</multi-tenant-oauth2-resource-server-spring-boot-autoconfigure.version>
     </properties>
 
     <dependencies>