chore: cleanup, update common

Author: g-otn

pom.xml

@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>com.github.soat-tech-challenge</groupId>
 			<artifactId>service-common</artifactId>
-			<version>4.2.2</version>
+			<version>5.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/br/com/grupo63/techchallenge/payment/ServicePaymentApplication.java

@@ -1,5 +1,7 @@
 package br.com.grupo63.techchallenge.payment;
 
+import br.com.grupo63.techchallenge.common.config.auth.jwt.JwtService;
+import br.com.grupo63.techchallenge.common.config.aws.ecs.ECSTaskIdInfoContributor;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
@@ -10,7 +12,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication
 @EnableFeignClients
 @OpenAPIDefinition(
 		info = @Info(title = "${info.name}", description = "${info.description}", version = "${info.version}"),
@@ -27,6 +28,11 @@
 		bearerFormat = "JWT",
 		in = SecuritySchemeIn.HEADER
 )
+@SpringBootApplication(scanBasePackageClasses = {
+		ServicePaymentApplication.class,
+		JwtService.class,
+		ECSTaskIdInfoContributor.class
+})
 public class ServicePaymentApplication {
 
 	public static void main(String[] args) {

src/main/java/br/com/grupo63/techchallenge/payment/config/JwtFilterConfig.java

@@ -1,7 +1,7 @@
 package br.com.grupo63.techchallenge.payment.config;
 
-import br.com.grupo63.techchallenge.common.config.JwtFilter;
-import org.springframework.beans.factory.annotation.Autowired;
+import br.com.grupo63.techchallenge.common.config.auth.jwt.JwtFilter;
+import br.com.grupo63.techchallenge.common.config.auth.jwt.JwtService;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,11 +11,8 @@
 @Configuration
 public class JwtFilterConfig {
 
-    @Autowired
-    private JwtService jwtService;
-
     @Bean
-    public FilterRegistrationBean<JwtFilter> jwtFilterFilterRegistrationBean() {
+    public FilterRegistrationBean<JwtFilter> jwtFilterFilterRegistrationBean(JwtService jwtService) {
         FilterRegistrationBean<JwtFilter> jwtFilterFilterRegistrationBean = new FilterRegistrationBean<>();
         jwtFilterFilterRegistrationBean.setFilter(new JwtFilter(jwtService));
         jwtFilterFilterRegistrationBean.setUrlPatterns(List.of("/payments/initialize"));

src/main/java/br/com/grupo63/techchallenge/payment/config/JwtService.java

@@ -31,12 +31,8 @@ spring:
 # --- Custom keys ---
 
 app:
+  auth:
+    jwt_public_key:  "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqStd8n4SGNM0eZhV/hzU+urHA5/IMZPoP9YQ9ZcLKWiX33nI6bSuZMCrLZcJExf63xS+uxDpGxM8Mnk2zOdl+lPwANXLzP1us5P1PyA3YPycW9J7C5YTQW0GiEL3M93ZX7vMJiVoBYblP3JPlYnoYlBORuc0JPk33KtfEZP+78qXpPHM8imYrJLe8ceiDLLFDU/nh5KC2dWAy3ci1ahoJ1Q9ELhp3IZLvOTX57H/T2VKOYOya5+ST41h+JjzI+qGTVnLcKaW+k25YLlVnkSspvdx98+yQDi7kbOTS6yRZHUPD6wPk/nUozpD0nZKccoH4W+zMwmQVtsAA6JCA9gfGwIDAQAB}"
   api-url:
     order: "${API_URL_ORDER:http://localhost:8002/order}"
     production: "${API_URL_PRODUCTION:http://localhost:8004/production}"
-
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqStd8n4SGNM0eZhV/hzU+urHA5/IMZPoP9YQ9ZcLKWiX33nI6bSuZMCrLZcJExf63xS+uxDpGxM8Mnk2zOdl+lPwANXLzP1us5P1PyA3YPycW9J7C5YTQW0GiEL3M93ZX7vMJiVoBYblP3JPlYnoYlBORuc0JPk33KtfEZP+78qXpPHM8imYrJLe8ceiDLLFDU/nh5KC2dWAy3ci1ahoJ1Q9ELhp3IZLvOTX57H/T2VKOYOya5+ST41h+JjzI+qGTVnLcKaW+k25YLlVnkSspvdx98+yQDi7kbOTS6yRZHUPD6wPk/nUozpD0nZKccoH4W+zMwmQVtsAA6JCA9gfGwIDAQAB}"
-

src/main/resources/application-dev.yml

@@ -6,3 +6,6 @@ spring:
     username: ${DB_USERNAME:backend}
   devtools:
     add-properties: false
+
+info:
+  ecs_metadata_url_v4: "${ECS_CONTAINER_METADATA_URI_V4:unknown}"

src/main/resources/application-prod.yml

@@ -50,6 +50,8 @@ server:
 # --- Custom keys ---
 
 app:
+  auth:
+    jwt_public_key: "${JWT_PUBLIC_KEY}"
   aws:
     session-token: "${AWS_SESSION_TOKEN:}"
   docs-api-url: "${DOCS_API_URL:(no value)}"
@@ -62,7 +64,3 @@ info:
   description: "@project.description@"
   version: "@project.version@"
 
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY}"

src/main/resources/application.yml

@@ -13,10 +13,8 @@ spring:
   output:
     ansi:
       enabled: always
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoNgzDuoQFLRFb3ivIA5CEHFRuqltT7xR6hFu+6xPD5q0sq8Exjue5s5MIQwkJMldk8/Dhp85OT5ULmAA5x4hPZfFlQEMlMPT5QItQImQ7UFCxBbMwksZlUQEP37Aa5OJ+KhEPBDTe0AaXqXFKxIOLEjHYWqhFHq5whxNotbuPrqLWEopCAgY4lqCe0pSoT3V+7Jszpq+czLBOl6eCbD933pK98/aVD9yA2+7LNOwmkYVyR4kvXX25K5Q/DDUZgMWyQTm3TCnfCrbdH6IH/Z12/DkePNuGFygUKDCEYPkPYnHbRXee4CXbeDkEdgZwzGJPM8gPhSUFrrzFVeihvN5OQIDAQAB}"
+
 management:
   endpoints:
-    enabled-by-default: false
+    enabled-by-default: false
+