Fixed public key configuration - build kotlin-service, build user-service, build person-service, build authentication-service, build edge-server

Author: Rodrigo Dos Santos

authentication-common/src/main/java/com/microservice/authentication/autoconfigure/AuthenticationCommonConfiguration.java

@@ -28,7 +28,6 @@
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.security.oauth2.resource.JwtAccessTokenConverterConfigurer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -162,8 +161,7 @@ public OAuth2AccessToken enhance(
         return converter;
     }
 
-    @Profile("prod")
-    @ConditionalOnMissingBean
+    @Profile("auth")
     @Bean
     KeyPair getKeyPair(AuthenticationProperties authenticationProperties) throws Exception {
         AuthenticationProperties.Jwt jwt = authenticationProperties.getJwt();
@@ -204,28 +202,13 @@ private String removeBeginEnd(String pem) {
         return pem.trim();
     }
 
-    @Primary
-    @Profile("prod")
-    @ConditionalOnMissingBean(KeyPair.class)
-    @Bean
-    RSAPublicKey publicKeyStore(@Value("${com.microservice.authentication.jwt.publicKeyStore}") RSAPublicKey key) {
-        return key;
-    }
-
     @Profile("prod")
     @ConditionalOnMissingBean
     @Bean
     RSAPublicKey publicKey(KeyPair keyPair) {
         return (RSAPublicKey) keyPair.getPublic();
     }
 
-    @Profile("prod")
-    @ConditionalOnMissingBean(KeyPair.class)
-    @Bean
-    RSAPublicKey publicKey(@Value("${com.microservice.authentication.jwt.key-store}") RSAPublicKey key) {
-        return key;
-    }
-
     @Bean
     UserDetailsService sharedAuthenticationService(AuthenticationCommonRepository authenticationCommonRepository) {
         return new SharedAuthenticationServiceImpl(authenticationCommonRepository);

kotlin-service/src/main/kotlin/com/microservice/kotlin/config/ServiceConfiguration.kt

@@ -16,6 +16,7 @@ import org.springframework.boot.info.GitProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
+import org.springframework.context.annotation.Profile
 import org.springframework.core.Ordered
 import org.springframework.core.annotation.Order
 import org.springframework.core.convert.support.DefaultConversionService
@@ -28,6 +29,7 @@ import org.springframework.data.util.TypeInformation
 import org.springframework.util.Assert
 import org.springframework.util.MultiValueMap
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean
+import java.security.interfaces.RSAPublicKey
 import java.util.*
 import java.util.stream.IntStream
 
@@ -73,6 +75,13 @@ class ServiceConfiguration {
         }
     }
 
+    @Primary
+    @Profile("prod")
+    @Bean
+    fun publicKeyStore(@Value("\${com.microservice.authentication.jwt.publicKeyStore}") key: RSAPublicKey?): RSAPublicKey? {
+        return key
+    }
+
     @ConditionalOnMissingBean
     @Bean
     fun querydslPredicateBuilderCustomizer(querydslBindingsFactory: QuerydslBindingsFactory): QuerydslPredicateBuilderCustomizer? {

person-service/src/main/java/com/microservice/person/PersonServiceApplication.java

@@ -1,6 +1,7 @@
 package com.microservice.person;
 
 import java.lang.annotation.Annotation;
+import java.security.interfaces.RSAPublicKey;
 import java.time.ZoneId;
 import java.util.Collection;
 import java.util.List;
@@ -39,6 +40,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -80,6 +82,13 @@ public void addViewControllers(ViewControllerRegistry registry) {
         registry.addRedirectViewController("/swagger/swagger-ui.html", "/swagger-ui.html");
     }
 
+    @Primary
+    @Profile("prod")
+    @Bean
+    RSAPublicKey publicKeyStore(@Value("${com.microservice.authentication.jwt.publicKeyStore}") RSAPublicKey key) {
+        return key;
+    }
+
 	@Configuration
     @ConditionalOnProperty(prefix = "kafka.local.test", name = "enabled", havingValue = "true")
 	class KafkaTestConfiguration {

user-service/src/main/java/com/microservice/user/UserServiceApplication.java

@@ -1,5 +1,6 @@
 package com.microservice.user;
 
+import java.security.interfaces.RSAPublicKey;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -9,12 +10,14 @@
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
 import org.springframework.data.querydsl.binding.PathInformation;
@@ -57,6 +60,13 @@ BuildProperties buildProperties() {
         return new BuildProperties(new Properties());
     }
 
+    @Primary
+    @Profile("prod")
+    @Bean
+    RSAPublicKey publicKeyStore(@Value("${com.microservice.authentication.jwt.publicKeyStore}") RSAPublicKey key) {
+        return key;
+    }
+
     @ConditionalOnMissingBean
     @Bean
     QuerydslPredicateBuilderCustomizer querydslPredicateBuilderCustomizer(QuerydslBindingsFactory querydslBindingsFactory) {