From dd32bb17e13212e20726442d4a3b9d7f173276a4 Mon Sep 17 00:00:00 2001 From: Nenad Jeckovic Date: Fri, 10 May 2024 14:09:17 +0200 Subject: [PATCH 1/2] Fix rental url --- .../java/com/productdock/adapter/out/web/RentalsApiClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/productdock/adapter/out/web/RentalsApiClient.java b/src/main/java/com/productdock/adapter/out/web/RentalsApiClient.java index 7cf12db..0b5e7f0 100644 --- a/src/main/java/com/productdock/adapter/out/web/RentalsApiClient.java +++ b/src/main/java/com/productdock/adapter/out/web/RentalsApiClient.java @@ -27,7 +27,7 @@ public class RentalsApiClient implements RentalsClient { private ObjectMapper objectMapper = new ObjectMapper(); - public RentalsApiClient(@Value("${rental.service.url}/api/rental/book/") String rentalsServiceUrl) { + public RentalsApiClient(@Value("${rental.service.url}/api/rental/books/") String rentalsServiceUrl) { this.rentalsServiceUrl = rentalsServiceUrl; } From 6c94d553e1454818f6d43519134d1a55299d02ff Mon Sep 17 00:00:00 2001 From: Nenad Jeckovic Date: Fri, 10 May 2024 14:10:32 +0200 Subject: [PATCH 2/2] Add internal route for books api --- src/main/java/com/productdock/adapter/in/web/GetBookApi.java | 2 +- src/main/java/com/productdock/config/SecurityConfig.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/productdock/adapter/in/web/GetBookApi.java b/src/main/java/com/productdock/adapter/in/web/GetBookApi.java index 5ab79fa..3a53db9 100644 --- a/src/main/java/com/productdock/adapter/in/web/GetBookApi.java +++ b/src/main/java/com/productdock/adapter/in/web/GetBookApi.java @@ -9,7 +9,7 @@ @Slf4j @RestController -@RequestMapping("/api/catalog/books") +@RequestMapping({"/api/catalog/books", "/api/catalog/internal/books"}) record GetBookApi(GetBookQuery getBookQuery, GetBookDtoMapper getBookDtoMapper) { @GetMapping("/{bookId}") diff --git a/src/main/java/com/productdock/config/SecurityConfig.java b/src/main/java/com/productdock/config/SecurityConfig.java index 4718de3..c9a194a 100644 --- a/src/main/java/com/productdock/config/SecurityConfig.java +++ b/src/main/java/com/productdock/config/SecurityConfig.java @@ -16,7 +16,7 @@ @RequiredArgsConstructor @Configuration public class SecurityConfig { - + private static final String ROLE_ADMIN = "SCOPE_ROLE_ADMIN"; @Value("${jwt.public.key}") @@ -27,6 +27,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti http.authorizeRequests(authorize -> authorize.antMatchers("/actuator/**").permitAll() .antMatchers(HttpMethod.POST, "/api/catalog/books").hasAuthority(ROLE_ADMIN) .antMatchers(HttpMethod.DELETE, "/api/catalog/books/{bookId}").hasAuthority(ROLE_ADMIN) + .antMatchers("/api/catalog/internal/**").permitAll() .anyRequest().authenticated()) .cors().and() .oauth2ResourceServer().jwt();