Merge pull request #9 from mzlnk/feature/GH-8

GH-8: temporary workaround for authorization error while using JWT tokens

Author: mzlnk

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);
         }
 
     }