add sample-secured router

Author: xcodeassociated

http/user-app.http

@@ -41,12 +41,33 @@ Authorization: Bearer {{oauthToken}}
 client.global.set("permissionId", null)
  %}
 
-### todo: move
+### external
 
 ###
 GET {{host}}/external/{{$random.integer(0, 1000)}}
 Authorization: Bearer {{oauthToken}}
 
+### sample-secured
+
+###
+GET {{host}}/sample-secured/{{$random.integer(0, 1000)}}
+Authorization: Bearer {{oauthToken}}
+
 ###
-GET {{host}}/error?message=foo
+POST {{host}}/sample-secured
+Content-Type: application/json
 Authorization: Bearer {{oauthToken}}
+
+{"data": "sample data: {{$uuid}}"}
+
+###
+PUT {{host}}/sample-secured/{{$random.integer(0, 1000)}}
+Content-Type: application/json
+Authorization: Bearer {{oauthToken}}
+
+{"data": "sample data: {{$uuid}} change"}
+
+###
+DELETE {{host}}/sample-secured/{{$random.integer(0, 1000)}}
+Authorization: Bearer {{oauthToken}}
+

src/main/kotlin/com/softeno/template/app/config/security/SecurityConfig.kt

@@ -100,8 +100,8 @@ class SecurityConfig {
                     "/v3/api-docs/**",
                 )
                     .permitAll()
-                    .pathMatchers("/permissions/**", "/ws/**", "/graphql/**", "/external/**").hasAuthority("ROLE_ADMIN")
-//                    .pathMatchers("/sample-secured/**").authenticated()
+                    .pathMatchers("/permissions/**", "/external/**").hasAuthority("ROLE_ADMIN")
+                    .pathMatchers("/sample-secured/**").authenticated()
             }
             .oauth2ResourceServer { rss ->
                 rss.jwt { jwtDecoder(issuer, jwkSetUri) }

src/main/kotlin/com/softeno/template/sample/http/external/api/ExternalController.kt renamed to src/main/kotlin/com/softeno/template/sample/http/api/ExternalController.kt

@@ -1,6 +1,6 @@
-package com.softeno.template.sample.http.external.api
+package com.softeno.template.sample.http.api
 
-import com.softeno.template.sample.http.external.config.ExternalClientConfig
+import com.softeno.template.sample.http.config.ExternalClientConfig
 import kotlinx.coroutines.reactor.awaitSingle
 import org.apache.commons.logging.LogFactory
 import org.springframework.beans.factory.annotation.Qualifier
@@ -14,8 +14,6 @@ import org.springframework.web.reactive.function.client.WebClient
 import reactor.core.publisher.Mono
 import java.time.Duration
 
-data class SampleResponseDto(val data: String)
-
 @RestController
 @RequestMapping("/external")
 @Validated

src/main/kotlin/com/softeno/template/sample/http/api/SampleRouter.kt

@@ -0,0 +1,60 @@
+package com.softeno.template.sample.http.api
+
+import org.apache.commons.logging.LogFactory
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.stereotype.Service
+import org.springframework.web.reactive.function.server.RequestPredicates.*
+import org.springframework.web.reactive.function.server.RouterFunction
+import org.springframework.web.reactive.function.server.RouterFunctions.route
+import org.springframework.web.reactive.function.server.ServerResponse
+import org.springframework.web.reactive.function.server.ServerResponse.ok
+import org.springframework.web.reactive.function.server.body
+import reactor.core.publisher.Mono
+
+@Configuration
+class SampleRouter {
+    // OAuth2 secured sample resource
+    @Bean
+    fun routes(service: SampleService): RouterFunction<ServerResponse> {
+        return route(GET("/sample-secured/{id}")) { req ->
+            ok().body(service.getHandler(req.pathVariable("id")))
+        }.andRoute(POST("/sample-secured")) { req ->
+            req.bodyToMono(SampleResponseDto::class.java).map {
+                service.postHandler(it)
+            }.flatMap { ok().body(it) }
+        }.andRoute(PUT("/sample-secured/{id}")) { req ->
+            req.bodyToMono(SampleResponseDto::class.java).map {
+                service.putHandler(req.pathVariable("id"), it)
+            }.flatMap { ok().bodyValue(it) }
+        }.andRoute(DELETE("/sample-secured/{id}")) { req ->
+            ok().body(service.deleteHandler(req.pathVariable("id")))
+        }
+    }
+}
+
+@Service
+class SampleService {
+    private val log = LogFactory.getLog(javaClass)
+
+    fun postHandler(request: SampleResponseDto): Mono<SampleResponseDto> {
+        log.info("[sample-service]: POST request: $request")
+        return Mono.just(request)
+    }
+
+    fun getHandler(id: String): Mono<SampleResponseDto> {
+        log.info("[sample-service]: GET id: $id")
+        return Mono.just(SampleResponseDto(data = id))
+    }
+
+    fun putHandler(id: String, request: SampleResponseDto): Mono<SampleResponseDto> {
+        log.info("[sample-service]: PUT id: $id, request: $request")
+        return Mono.just(request)
+    }
+
+    fun deleteHandler(id: String): Mono<Void> {
+        log.info("[sample-service]: GET id: $id")
+        return Mono.empty()
+    }
+
+}

src/main/kotlin/com/softeno/template/sample/http/api/dto.kt

@@ -0,0 +1,3 @@
+package com.softeno.template.sample.http.api
+
+data class SampleResponseDto(val data: String)

src/main/kotlin/com/softeno/template/sample/http/external/config/CircuitBreakerConfig.kt renamed to src/main/kotlin/com/softeno/template/sample/http/config/CircuitBreakerConfig.kt

@@ -1,4 +1,4 @@
-package com.softeno.template.sample.http.external.config
+package com.softeno.template.sample.http.config
 
 import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry

src/main/kotlin/com/softeno/template/sample/http/external/config/WebClientConfig.kt renamed to src/main/kotlin/com/softeno/template/sample/http/config/WebClientConfig.kt

@@ -1,4 +1,4 @@
-package com.softeno.template.sample.http.external.config
+package com.softeno.template.sample.http.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Bean

src/test/kotlin/com/softeno/template/app/IntegrationTest.kt

@@ -11,7 +11,7 @@ import com.softeno.template.app.permission.PermissionFixture
 import com.softeno.template.app.permission.PermissionFixture.Companion.aPermission
 import com.softeno.template.app.permission.PermissionFixture.Companion.aPermissionDto
 import com.softeno.template.app.permission.db.PermissionRepository
-import com.softeno.template.sample.http.external.api.SampleResponseDto
+import com.softeno.template.sample.http.api.SampleResponseDto
 import io.mockk.every
 import kotlinx.coroutines.flow.count
 import kotlinx.coroutines.flow.first

src/test/kotlin/com/softeno/template/sample/http/external/config/WebClientConfig.kt renamed to src/test/kotlin/com/softeno/template/sample/http/config/WebClientConfig.kt

@@ -1,4 +1,4 @@
-package com.softeno.template.sample.http.external.config
+package com.softeno.template.sample.http.config
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration