Merge pull request #12 from quantics-io/release/0.3.2

Release 0.3.2
quantics-io · Nov 12, 2023 · bb043d2 · bb043d2
2 parents 8307b17 + 0e06996
commit bb043d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>io.quantics</groupId>
     <artifactId>multitenant-oauth2-spring-boot-starter</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.2</version>
     <name>Spring Boot starter library for multi-tenant OAuth2 resource servers</name>
 
     <licenses>

diff --git a/...a/io/quantics/multitenant/oauth2/config/MultiTenantResourceServerWebMvcConfiguration.java b/...a/io/quantics/multitenant/oauth2/config/MultiTenantResourceServerWebMvcConfiguration.java
@@ -6,6 +6,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -40,7 +41,7 @@ public class MultiTenantResourceServerWebMvcConfiguration {
 
     private static final Log logger = LogFactory.getLog(WebMvcConfigurer.class);
 
-    @Bean
+    @Bean({ "multiTenantHeaderInterceptor", "multiTenantInterceptor" })
     @Conditional(HeaderCondition.class)
     HandlerInterceptor multiTenantHeaderInterceptor(MultiTenantResourceServerProperties properties,
                                                     TenantDetailsService tenantService) {
@@ -75,7 +76,7 @@ public void postHandle(@NonNull HttpServletRequest request, @NonNull HttpServlet
         };
     }
 
-    @Bean
+    @Bean({ "multiTenantJwtInterceptor", "multiTenantInterceptor" })
     @Conditional(JwtCondition.class)
     HandlerInterceptor multiTenantJwtInterceptor(TenantDetailsService tenantService) {
         return new HandlerInterceptor() {
@@ -108,16 +109,16 @@ public void postHandle(@NonNull HttpServletRequest request, @NonNull HttpServlet
     }
 
     @Bean
-    @ConditionalOnBean(HandlerInterceptor.class)
+    @ConditionalOnBean(value = HandlerInterceptor.class, name = "multiTenantInterceptor")
     WebMvcConfigurer multiTenantWebMvcConfigurer() {
         return new WebMvcConfigurer() {
 
             @Autowired
-            private HandlerInterceptor interceptor;
+            private HandlerInterceptor multiTenantInterceptor;
 
             @Override
             public void addInterceptors(@NonNull InterceptorRegistry registry) {
-                registry.addInterceptor(interceptor);
+                registry.addInterceptor(multiTenantInterceptor);
             }
         };
     }