refactor :: requestBody 삭제

team-xquare · Feb 15, 2024 · 8fc30ce · 8fc30ce
1 parent 2091d0f
commit 8fc30ce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/src/main/kotlin/com/example/v1oauthauthorizationservice/domain/oauth/api/OAuthApi.kt b/src/main/kotlin/com/example/v1oauthauthorizationservice/domain/oauth/api/OAuthApi.kt
@@ -6,9 +6,11 @@ import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentatio
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.RegisterClientResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.ClientsResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.UpdateClientResponse
+import com.example.v1oauthauthorizationservice.infrastructure.user.repository.dtos.UserInformationDto
+import java.util.UUID
 
 interface OAuthApi {
-    fun getClient(request: RegisterClientRequest): ClientsResponse
+    fun getClient(): ClientsResponse
     fun registerClient(request: RegisterClientRequest): RegisterClientResponse
     fun updateClient(clientId: String, request: UpdateClientRequest): UpdateClientResponse
     fun regenerateSecret(clientId: String): RegenerateSecretResponse

diff --git a/src/main/kotlin/com/example/v1oauthauthorizationservice/domain/oauth/api/OAuthApiImpl.kt b/src/main/kotlin/com/example/v1oauthauthorizationservice/domain/oauth/api/OAuthApiImpl.kt
@@ -6,9 +6,9 @@ import com.example.v1oauthauthorizationservice.domain.security.spi.SecuritySpi
 import com.example.v1oauthauthorizationservice.infrastructure.configuration.oauth2.exceptions.RegisteredClientAlreadyExistsException
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.request.RegisterClientRequest
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.request.UpdateClientRequest
-import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.RegisterClientResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.ClientsResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.RegenerateSecretResponse
+import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.RegisterClientResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.UpdateClientResponse
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
@@ -20,7 +20,7 @@ class OAuthApiImpl(
     private val securitySpi: SecuritySpi
 ) : OAuthApi {
 
-    override fun getClient(request: RegisterClientRequest): ClientsResponse {
+    override fun getClient(): ClientsResponse {
         val userId = securitySpi.getCurrentUserId()
         return ClientsResponse(
             registeredClientSpi.getByUserId(userId)

diff --git a/...example/v1oauthauthorizationservice/infrastructure/oauth2/presentation/OAuthController.kt b/...example/v1oauthauthorizationservice/infrastructure/oauth2/presentation/OAuthController.kt
@@ -3,27 +3,24 @@ package com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentati
 import com.example.v1oauthauthorizationservice.domain.oauth.api.OAuthApi
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.request.RegisterClientRequest
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.request.UpdateClientRequest
+import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.ClientsResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.RegenerateSecretResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.RegisterClientResponse
-import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.ClientsResponse
 import com.example.v1oauthauthorizationservice.infrastructure.oauth2.presentation.dto.response.UpdateClientResponse
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PatchMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import com.example.v1oauthauthorizationservice.infrastructure.user.repository.dtos.UserInformationDto
+import com.example.v1oauthauthorizationservice.infrastructure.user.security.AuthDetailsService
+import org.springframework.web.bind.annotation.*
 
 @RestController
 @RequestMapping("/oauth2")
 class OAuthController(
-    private val OAuthApi: OAuthApi
+    private val OAuthApi: OAuthApi,
+    private val authDetailsService: AuthDetailsService
 ) {
 
     @GetMapping("/client")
-    fun getClient(@RequestBody request: RegisterClientRequest): ClientsResponse {
-        return OAuthApi.getClient(request)
+    fun getClient(): ClientsResponse {
+        return OAuthApi.getClient()
     }
 
     @PostMapping("/client")
@@ -40,4 +37,9 @@ class OAuthController(
     fun regenerateSecret(@PathVariable("client-id") clientId: String): RegenerateSecretResponse {
         return OAuthApi.regenerateSecret(clientId)
     }
+
+    @GetMapping("/userinfo/{account-id}")
+    fun getUserInfo(@PathVariable("account-id") accountId: String): UserInformationDto {
+        return authDetailsService.getUserInformation(accountId)
+    }
 }