From d35a3b70c7ffb03d06a1c7e83698b1b8a0106759 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Fri, 4 Aug 2023 03:56:24 +0900 Subject: [PATCH 01/57] feat: Add Security Config --- .../moduleapi/config/SecurityConfig.kt | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt b/module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt new file mode 100644 index 0000000..a137eeb --- /dev/null +++ b/module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt @@ -0,0 +1,27 @@ +package universe.sparkle.moduleapi.config + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.http.SessionCreationPolicy +import org.springframework.security.web.SecurityFilterChain + +@Configuration +@EnableWebSecurity +class SecurityConfig @Autowired constructor() { + + @Bean + @Throws(Exception::class) + fun filterChain(http: HttpSecurity): SecurityFilterChain { + return http.cors { it.disable() } + .csrf { it.disable() } + .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) } + .formLogin { it.disable() } + .authorizeHttpRequests { + it.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/auth/*", "/status/uni/*").permitAll() + it.requestMatchers("/api").authenticated() + }.build() + } +} From dae771ba574590867a22b5292b37252288a8e080 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Fri, 4 Aug 2023 03:56:41 +0900 Subject: [PATCH 02/57] feat: Create Request Response Log --- .../moduleapi/filter/CachedInputStream.kt | 34 ++++++++ .../filter/DuplicateAccessibleRequest.kt | 21 +++++ .../sparkle/moduleapi/filter/Logging.kt | 13 +++ .../filter/RequestAndResponseLogFilter.kt | 80 +++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt create mode 100644 module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt create mode 100644 module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt create mode 100644 module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt new file mode 100644 index 0000000..10b976f --- /dev/null +++ b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt @@ -0,0 +1,34 @@ +package universe.sparkle.moduleapi.filter + +import jakarta.servlet.ReadListener +import jakarta.servlet.ServletInputStream +import java.io.ByteArrayInputStream +import java.io.IOException + +class CachedInputStream( + cachedInputStream: ByteArray, +) : ServletInputStream() { + + private val cachedBodyInputStream: ByteArrayInputStream + + init { + this.cachedBodyInputStream = ByteArrayInputStream(cachedInputStream) + } + + override fun read(): Int = cachedBodyInputStream.read() + + override fun isFinished(): Boolean { + try { + return cachedBodyInputStream.available() == 0 + } catch (exception: IOException) { + exception.printStackTrace() + } + return false + } + + override fun isReady(): Boolean = true + + override fun setReadListener(listener: ReadListener?) { + throw UnsupportedOperationException("Unsupported Operation setReadListener in CachedInputStream Object") + } +} diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt new file mode 100644 index 0000000..232fdb1 --- /dev/null +++ b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt @@ -0,0 +1,21 @@ +package universe.sparkle.moduleapi.filter + +import jakarta.servlet.ServletInputStream +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequestWrapper +import org.springframework.util.StreamUtils + +class DuplicateAccessibleRequest( + request: HttpServletRequest, +) : HttpServletRequestWrapper(request) { + + private val cachedInputStream: ByteArray + + init { + this.cachedInputStream = StreamUtils.copyToByteArray(request.inputStream) + } + + override fun getInputStream(): ServletInputStream { + return CachedInputStream(cachedInputStream) + } +} diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt new file mode 100644 index 0000000..815036e --- /dev/null +++ b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt @@ -0,0 +1,13 @@ +package universe.sparkle.moduleapi.filter + +import org.slf4j.Logger +import org.slf4j.LoggerFactory +import kotlin.properties.ReadOnlyProperty +import kotlin.reflect.KProperty + +class Logging : ReadOnlyProperty { + + override fun getValue(thisRef: Any, property: KProperty<*>): Logger { + return LoggerFactory.getLogger(thisRef.javaClass) + } +} diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt new file mode 100644 index 0000000..77721e7 --- /dev/null +++ b/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt @@ -0,0 +1,80 @@ +package universe.sparkle.moduleapi.filter + +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.stereotype.Component +import org.springframework.util.StreamUtils +import org.springframework.web.filter.OncePerRequestFilter +import org.springframework.web.util.ContentCachingResponseWrapper +import java.io.IOException +import java.io.InputStream + +@Component +class RequestAndResponseLogFilter : OncePerRequestFilter() { + val requestLogger by Logging() + + override fun doFilterInternal( + request: HttpServletRequest, + response: HttpServletResponse, + filterChain: FilterChain, + ) { + if (isAsyncDispatch(request)) { + filterChain.doFilter(request, response) + } else { + val duplicateAccessibleRequest = DuplicateAccessibleRequest(request) + val cachingResponseWrapper = ContentCachingResponseWrapper(response) + loggingDoFilter(duplicateAccessibleRequest, cachingResponseWrapper, filterChain) + cachingResponseWrapper.copyBodyToResponse() + } + } + + private fun loggingDoFilter( + request: DuplicateAccessibleRequest, + response: ContentCachingResponseWrapper, + filterChain: FilterChain, + ) = try { + logRequest(request) + logPayload(request.contentType ?: "application/json", request.inputStream) + filterChain.doFilter(request, response) + } finally { + logResponse(response) + logPayload(response.contentType ?: "application/json", response.contentInputStream) + } + + @Throws(IOException::class) + private fun logRequest(request: DuplicateAccessibleRequest) = requestLogger.run { + info("<< Request : [${request.method}] ${request.requestURI}${request.queryString ?: ""}") + info("content-Type : ${request.contentType ?: "Unknown"}") + info("IP : ${request.remoteAddr}") + } + + @Throws(IOException::class) + private fun logResponse(response: ContentCachingResponseWrapper) = requestLogger.run { + info(">> Response : ${HttpStatus.valueOf(response.status)}") + info("Content-Type : ${response.contentType ?: "Unknown"}") + } + + private fun logPayload(contentType: String, inputStream: InputStream) = requestLogger.run { + if (isVisible(MediaType.valueOf(contentType))) { + val content = StreamUtils.copyToByteArray(inputStream) + info("Body : ${if (content.isNotEmpty()) String(content) else ""}") + } else { + info("Body : Binary Content") + } + } + + private fun isVisible(mediaType: MediaType): Boolean { + return listOf( + MediaType.valueOf("text/*"), + MediaType.APPLICATION_FORM_URLENCODED, + MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, + MediaType.valueOf("application/*+json"), + MediaType.valueOf("application/*+xml"), + MediaType.MULTIPART_FORM_DATA, + ).stream().anyMatch { it.includes(mediaType) } + } +} From abcf2ee68c0e9a58421621a56fe1cd05ba5337ba Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:08:42 +0900 Subject: [PATCH 03/57] chore: re setting module --- .../ModuleCoreDomainApplication.kt | 4 - module-data/build.gradle | 55 ---- module-data/settings.gradle | 9 - .../moduledata/ModuleDataApplication.kt | 11 - .../src/main/resources/application.properties | 1 - .../moduledata/ModuleDataApplicationTests.kt | 12 - {module-api => module-domain}/.gitignore | 0 .../build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {module-api => module-domain}/gradlew | 0 {module-api => module-domain}/gradlew.bat | 0 .../settings.gradle | 0 .../ModuleCoreDomainApplicationTests.kt | 2 +- .../.gitignore | 0 .../build.gradle | 17 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../settings.gradle | 0 .../infrastructure}/ModuleApiApplication.kt | 2 +- .../infrastructure}/config/SecurityConfig.kt | 2 +- .../filter/CachedInputStream.kt | 2 +- .../filter/DuplicateAccessibleRequest.kt | 2 +- .../sparkle/infrastructure}/filter/Logging.kt | 2 +- .../filter/RequestAndResponseLogFilter.kt | 2 +- .../infrastructure/security/UserDetail.kt | 37 +++ .../ModuleApiApplicationTests.kt | 2 +- module-service/.gitignore | 37 --- .../gradle/wrapper/gradle-wrapper.jar | Bin 63375 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - module-service/gradlew | 248 ------------------ module-service/gradlew.bat | 92 ------- .../moduleservice/ModuleServiceApplication.kt | 11 - {module-data => module-usecase}/.gitignore | 0 .../build.gradle | 8 + .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {module-data => module-usecase}/gradlew | 0 {module-data => module-usecase}/gradlew.bat | 0 .../settings.gradle | 0 .../usecase}/ModuleServiceApplicationTests.kt | 2 +- settings.gradle | 7 +- 44 files changed, 72 insertions(+), 502 deletions(-) delete mode 100644 module-core-domain/src/main/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplication.kt delete mode 100644 module-data/build.gradle delete mode 100644 module-data/settings.gradle delete mode 100644 module-data/src/main/kotlin/universe/sparkle/moduledata/ModuleDataApplication.kt delete mode 100644 module-data/src/main/resources/application.properties delete mode 100644 module-data/src/test/kotlin/universe/sparkle/moduledata/ModuleDataApplicationTests.kt rename {module-api => module-domain}/.gitignore (100%) rename {module-core-domain => module-domain}/build.gradle (100%) rename {module-api => module-domain}/gradle/wrapper/gradle-wrapper.jar (100%) rename {module-api => module-domain}/gradle/wrapper/gradle-wrapper.properties (100%) rename {module-api => module-domain}/gradlew (100%) rename {module-api => module-domain}/gradlew.bat (100%) rename {module-core-domain => module-domain}/settings.gradle (100%) rename {module-core-domain/src/test/kotlin/universe/sparkle/modulecoredomain => module-domain/src/test/kotlin/universe/sparkle/domain}/ModuleCoreDomainApplicationTests.kt (74%) rename {module-core-domain => module-infrastructure}/.gitignore (100%) rename {module-api => module-infrastructure}/build.gradle (74%) rename {module-core-domain => module-infrastructure}/gradle/wrapper/gradle-wrapper.jar (100%) rename {module-core-domain => module-infrastructure}/gradle/wrapper/gradle-wrapper.properties (100%) rename {module-core-domain => module-infrastructure}/gradlew (100%) rename {module-core-domain => module-infrastructure}/gradlew.bat (100%) rename {module-api => module-infrastructure}/settings.gradle (100%) rename {module-api/src/main/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure}/ModuleApiApplication.kt (86%) rename {module-api/src/main/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure}/config/SecurityConfig.kt (95%) rename {module-api/src/main/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure}/filter/CachedInputStream.kt (95%) rename {module-api/src/main/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure}/filter/DuplicateAccessibleRequest.kt (92%) rename {module-api/src/main/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure}/filter/Logging.kt (87%) rename {module-api/src/main/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure}/filter/RequestAndResponseLogFilter.kt (98%) create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt rename {module-api/src/test/kotlin/universe/sparkle/moduleapi => module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure}/ModuleApiApplicationTests.kt (82%) delete mode 100644 module-service/.gitignore delete mode 100644 module-service/gradle/wrapper/gradle-wrapper.jar delete mode 100644 module-service/gradle/wrapper/gradle-wrapper.properties delete mode 100644 module-service/gradlew delete mode 100644 module-service/gradlew.bat delete mode 100644 module-service/src/main/kotlin/universe/sparkle/moduleservice/ModuleServiceApplication.kt rename {module-data => module-usecase}/.gitignore (100%) rename {module-service => module-usecase}/build.gradle (91%) rename {module-data => module-usecase}/gradle/wrapper/gradle-wrapper.jar (100%) rename {module-data => module-usecase}/gradle/wrapper/gradle-wrapper.properties (100%) rename {module-data => module-usecase}/gradlew (100%) rename {module-data => module-usecase}/gradlew.bat (100%) rename {module-service => module-usecase}/settings.gradle (100%) rename {module-service/src/test/kotlin/universe/sparkle/moduleservice => module-usecase/src/test/kotlin/universe/sparkle/usecase}/ModuleServiceApplicationTests.kt (83%) diff --git a/module-core-domain/src/main/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplication.kt b/module-core-domain/src/main/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplication.kt deleted file mode 100644 index ed5e64c..0000000 --- a/module-core-domain/src/main/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplication.kt +++ /dev/null @@ -1,4 +0,0 @@ -package universe.sparkle.modulecoredomain - -fun main(args: Array) { -} diff --git a/module-data/build.gradle b/module-data/build.gradle deleted file mode 100644 index 0bf97e4..0000000 --- a/module-data/build.gradle +++ /dev/null @@ -1,55 +0,0 @@ -plugins { - alias libs.plugins.spring.boot - alias libs.plugins.spring.dependency.manage - alias libs.plugins.kotlin.jvm - alias libs.plugins.kotlin.plugin.spring - alias libs.plugins.kotlin.plugin.jpa -} - -version = libs.versions.service.get() - -java { - sourceCompatibility = '17' -} - -kotlin { - jvmToolchain(17) -} - -repositories { - mavenCentral() -} - -allOpen { - annotation("jakarta.persistence.Entity") - annotation("jakarta.persistence.MappedSuperclass") - annotation("jakarta.persistence.Embeddable") -} - -noArg { - annotation("jakarta.persistence.Entity") -} - -dependencies { - implementation project(':module-service') - implementation project(':module-core-domain') - implementation libs.spring.boot.starter.jpa - implementation libs.kotlin.reflect - - runtimeOnly libs.db.mysql - - testImplementation libs.test.spring.boot.starter -} - -tasks.named('test') { - useJUnitPlatform() -} - -copy { - from('../uni-kotlin-config') - include('src/**/*.yml') - into('.') - eachFile { file -> - println "> copy file: ${file.sourcePath}" - } -} diff --git a/module-data/settings.gradle b/module-data/settings.gradle deleted file mode 100644 index fb5d311..0000000 --- a/module-data/settings.gradle +++ /dev/null @@ -1,9 +0,0 @@ -rootProject.name = 'module-data' - -dependencyResolutionManagement { - versionCatalogs { - libs { - from(files("../gradle/libs.versions.toml")) - } - } -} diff --git a/module-data/src/main/kotlin/universe/sparkle/moduledata/ModuleDataApplication.kt b/module-data/src/main/kotlin/universe/sparkle/moduledata/ModuleDataApplication.kt deleted file mode 100644 index d109d52..0000000 --- a/module-data/src/main/kotlin/universe/sparkle/moduledata/ModuleDataApplication.kt +++ /dev/null @@ -1,11 +0,0 @@ -package universe.sparkle.moduledata - -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication - -@SpringBootApplication -class ModuleDataApplication - -fun main(args: Array) { - runApplication(*args) -} diff --git a/module-data/src/main/resources/application.properties b/module-data/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/module-data/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/module-data/src/test/kotlin/universe/sparkle/moduledata/ModuleDataApplicationTests.kt b/module-data/src/test/kotlin/universe/sparkle/moduledata/ModuleDataApplicationTests.kt deleted file mode 100644 index b6df43e..0000000 --- a/module-data/src/test/kotlin/universe/sparkle/moduledata/ModuleDataApplicationTests.kt +++ /dev/null @@ -1,12 +0,0 @@ -package universe.sparkle.moduledata - -import org.junit.jupiter.api.Test -import org.springframework.boot.test.context.SpringBootTest - -@SpringBootTest -class ModuleDataApplicationTests { - - @Test - fun contextLoads() { - } -} diff --git a/module-api/.gitignore b/module-domain/.gitignore similarity index 100% rename from module-api/.gitignore rename to module-domain/.gitignore diff --git a/module-core-domain/build.gradle b/module-domain/build.gradle similarity index 100% rename from module-core-domain/build.gradle rename to module-domain/build.gradle diff --git a/module-api/gradle/wrapper/gradle-wrapper.jar b/module-domain/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from module-api/gradle/wrapper/gradle-wrapper.jar rename to module-domain/gradle/wrapper/gradle-wrapper.jar diff --git a/module-api/gradle/wrapper/gradle-wrapper.properties b/module-domain/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from module-api/gradle/wrapper/gradle-wrapper.properties rename to module-domain/gradle/wrapper/gradle-wrapper.properties diff --git a/module-api/gradlew b/module-domain/gradlew similarity index 100% rename from module-api/gradlew rename to module-domain/gradlew diff --git a/module-api/gradlew.bat b/module-domain/gradlew.bat similarity index 100% rename from module-api/gradlew.bat rename to module-domain/gradlew.bat diff --git a/module-core-domain/settings.gradle b/module-domain/settings.gradle similarity index 100% rename from module-core-domain/settings.gradle rename to module-domain/settings.gradle diff --git a/module-core-domain/src/test/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplicationTests.kt b/module-domain/src/test/kotlin/universe/sparkle/domain/ModuleCoreDomainApplicationTests.kt similarity index 74% rename from module-core-domain/src/test/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplicationTests.kt rename to module-domain/src/test/kotlin/universe/sparkle/domain/ModuleCoreDomainApplicationTests.kt index 210e8f2..1932999 100644 --- a/module-core-domain/src/test/kotlin/universe/sparkle/modulecoredomain/ModuleCoreDomainApplicationTests.kt +++ b/module-domain/src/test/kotlin/universe/sparkle/domain/ModuleCoreDomainApplicationTests.kt @@ -1,4 +1,4 @@ -package universe.sparkle.modulecoredomain +package universe.sparkle.domain import org.junit.jupiter.api.Test diff --git a/module-core-domain/.gitignore b/module-infrastructure/.gitignore similarity index 100% rename from module-core-domain/.gitignore rename to module-infrastructure/.gitignore diff --git a/module-api/build.gradle b/module-infrastructure/build.gradle similarity index 74% rename from module-api/build.gradle rename to module-infrastructure/build.gradle index 03552aa..31c72f8 100644 --- a/module-api/build.gradle +++ b/module-infrastructure/build.gradle @@ -3,6 +3,7 @@ plugins { alias libs.plugins.spring.dependency.manage alias libs.plugins.kotlin.jvm alias libs.plugins.kotlin.plugin.spring + alias libs.plugins.kotlin.plugin.jpa } group = 'universe.spakle' @@ -31,13 +32,15 @@ repositories { } dependencies { - implementation project(':module-service') - implementation project(':module-core-domain') + implementation project(':module-usecase') + implementation project(':module-domain') implementation libs.spring.boot.starter.web implementation libs.spring.boot.starter.security implementation libs.spring.boot.starter.validation implementation libs.spring.boot.starter.actuator + implementation libs.spring.boot.starter.jpa + implementation libs.jackson.kotlin implementation libs.kotlin.reflect @@ -47,6 +50,16 @@ dependencies { testImplementation libs.test.spring.security } +allOpen { + annotation("jakarta.persistence.Entity") + annotation("jakarta.persistence.MappedSuperclass") + annotation("jakarta.persistence.Embeddable") +} + +noArg { + annotation("jakarta.persistence.Entity") +} + tasks.named('test') { useJUnitPlatform() } diff --git a/module-core-domain/gradle/wrapper/gradle-wrapper.jar b/module-infrastructure/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from module-core-domain/gradle/wrapper/gradle-wrapper.jar rename to module-infrastructure/gradle/wrapper/gradle-wrapper.jar diff --git a/module-core-domain/gradle/wrapper/gradle-wrapper.properties b/module-infrastructure/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from module-core-domain/gradle/wrapper/gradle-wrapper.properties rename to module-infrastructure/gradle/wrapper/gradle-wrapper.properties diff --git a/module-core-domain/gradlew b/module-infrastructure/gradlew similarity index 100% rename from module-core-domain/gradlew rename to module-infrastructure/gradlew diff --git a/module-core-domain/gradlew.bat b/module-infrastructure/gradlew.bat similarity index 100% rename from module-core-domain/gradlew.bat rename to module-infrastructure/gradlew.bat diff --git a/module-api/settings.gradle b/module-infrastructure/settings.gradle similarity index 100% rename from module-api/settings.gradle rename to module-infrastructure/settings.gradle diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/ModuleApiApplication.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt similarity index 86% rename from module-api/src/main/kotlin/universe/sparkle/moduleapi/ModuleApiApplication.kt rename to module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt index e0d88c9..3bc1469 100644 --- a/module-api/src/main/kotlin/universe/sparkle/moduleapi/ModuleApiApplication.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi +package universe.sparkle.infrastructure import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt similarity index 95% rename from module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt rename to module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt index a137eeb..a5ed3cd 100644 --- a/module-api/src/main/kotlin/universe/sparkle/moduleapi/config/SecurityConfig.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi.config +package universe.sparkle.infrastructure.config import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/CachedInputStream.kt similarity index 95% rename from module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt rename to module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/CachedInputStream.kt index 10b976f..8b2ffe3 100644 --- a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/CachedInputStream.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/CachedInputStream.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi.filter +package universe.sparkle.infrastructure.filter import jakarta.servlet.ReadListener import jakarta.servlet.ServletInputStream diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/DuplicateAccessibleRequest.kt similarity index 92% rename from module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt rename to module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/DuplicateAccessibleRequest.kt index 232fdb1..930b9b5 100644 --- a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/DuplicateAccessibleRequest.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/DuplicateAccessibleRequest.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi.filter +package universe.sparkle.infrastructure.filter import jakarta.servlet.ServletInputStream import jakarta.servlet.http.HttpServletRequest diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/Logging.kt similarity index 87% rename from module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt rename to module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/Logging.kt index 815036e..bc54771 100644 --- a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/Logging.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/Logging.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi.filter +package universe.sparkle.infrastructure.filter import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/RequestAndResponseLogFilter.kt similarity index 98% rename from module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt rename to module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/RequestAndResponseLogFilter.kt index 77721e7..bd09d25 100644 --- a/module-api/src/main/kotlin/universe/sparkle/moduleapi/filter/RequestAndResponseLogFilter.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/RequestAndResponseLogFilter.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi.filter +package universe.sparkle.infrastructure.filter import jakarta.servlet.FilterChain import jakarta.servlet.http.HttpServletRequest diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt new file mode 100644 index 0000000..ffa4183 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt @@ -0,0 +1,37 @@ +package universe.sparkle.infrastructure.security + +import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.userdetails.UserDetails + +class UserDetail private constructor( + private val id: Long, + private val nickname: +): UserDetails { + override fun getAuthorities(): MutableCollection { + TODO("Not yet implemented") + } + + override fun getPassword(): String { + TODO("Not yet implemented") + } + + override fun getUsername(): String { + TODO("Not yet implemented") + } + + override fun isAccountNonExpired(): Boolean { + TODO("Not yet implemented") + } + + override fun isAccountNonLocked(): Boolean { + TODO("Not yet implemented") + } + + override fun isCredentialsNonExpired(): Boolean { + TODO("Not yet implemented") + } + + override fun isEnabled(): Boolean { + TODO("Not yet implemented") + } +} diff --git a/module-api/src/test/kotlin/universe/sparkle/moduleapi/ModuleApiApplicationTests.kt b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt similarity index 82% rename from module-api/src/test/kotlin/universe/sparkle/moduleapi/ModuleApiApplicationTests.kt rename to module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt index bf8cfc8..9a5e224 100644 --- a/module-api/src/test/kotlin/universe/sparkle/moduleapi/ModuleApiApplicationTests.kt +++ b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleapi +package universe.sparkle.infrastructure import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest diff --git a/module-service/.gitignore b/module-service/.gitignore deleted file mode 100644 index c2065bc..0000000 --- a/module-service/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/module-service/gradle/wrapper/gradle-wrapper.jar b/module-service/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 033e24c4cdf41af1ab109bc7f253b2b887023340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63375 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≫L+crb^Bz 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 '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/module-service/gradlew.bat b/module-service/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/module-service/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/module-service/src/main/kotlin/universe/sparkle/moduleservice/ModuleServiceApplication.kt b/module-service/src/main/kotlin/universe/sparkle/moduleservice/ModuleServiceApplication.kt deleted file mode 100644 index ac77772..0000000 --- a/module-service/src/main/kotlin/universe/sparkle/moduleservice/ModuleServiceApplication.kt +++ /dev/null @@ -1,11 +0,0 @@ -package universe.sparkle.moduleservice - -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication - -@SpringBootApplication -class ModuleServiceApplication - -fun main(args: Array) { - runApplication(*args) -} diff --git a/module-data/.gitignore b/module-usecase/.gitignore similarity index 100% rename from module-data/.gitignore rename to module-usecase/.gitignore diff --git a/module-service/build.gradle b/module-usecase/build.gradle similarity index 91% rename from module-service/build.gradle rename to module-usecase/build.gradle index 2e04855..7fd38cb 100644 --- a/module-service/build.gradle +++ b/module-usecase/build.gradle @@ -15,6 +15,14 @@ kotlin { jvmToolchain(17) } +bootJar { + enabled = false +} + +jar { + enabled = true +} + repositories { mavenCentral() } diff --git a/module-data/gradle/wrapper/gradle-wrapper.jar b/module-usecase/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from module-data/gradle/wrapper/gradle-wrapper.jar rename to module-usecase/gradle/wrapper/gradle-wrapper.jar diff --git a/module-data/gradle/wrapper/gradle-wrapper.properties b/module-usecase/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from module-data/gradle/wrapper/gradle-wrapper.properties rename to module-usecase/gradle/wrapper/gradle-wrapper.properties diff --git a/module-data/gradlew b/module-usecase/gradlew similarity index 100% rename from module-data/gradlew rename to module-usecase/gradlew diff --git a/module-data/gradlew.bat b/module-usecase/gradlew.bat similarity index 100% rename from module-data/gradlew.bat rename to module-usecase/gradlew.bat diff --git a/module-service/settings.gradle b/module-usecase/settings.gradle similarity index 100% rename from module-service/settings.gradle rename to module-usecase/settings.gradle diff --git a/module-service/src/test/kotlin/universe/sparkle/moduleservice/ModuleServiceApplicationTests.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt similarity index 83% rename from module-service/src/test/kotlin/universe/sparkle/moduleservice/ModuleServiceApplicationTests.kt rename to module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt index 7160987..586fb54 100644 --- a/module-service/src/test/kotlin/universe/sparkle/moduleservice/ModuleServiceApplicationTests.kt +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt @@ -1,4 +1,4 @@ -package universe.sparkle.moduleservice +package universe.sparkle.usecase import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest diff --git a/settings.gradle b/settings.gradle index ec87152..59b7aca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ rootProject.name = 'sparkle' -include("module-api") -include("module-core-domain") -include("module-service") -include("module-data") +include("module-infrastructure") +include("module-domain") +include("module-usecase") From 3f05a8059887e9b7a4c6c168c74afde2623bcffa Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:42:29 +0900 Subject: [PATCH 04/57] feat: Add BadRequest Exception --- .../kotlin/universe/sparkle/domain/exception/BadRequest.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt new file mode 100644 index 0000000..2f455d0 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class BadRequest( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From ce9371d1b0580c3efd59cc306b6d554b8eb9f079 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:42:41 +0900 Subject: [PATCH 05/57] feat: Add BusinessException --- .../domain/exception/BusinessException.kt | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt new file mode 100644 index 0000000..2f871d8 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt @@ -0,0 +1,43 @@ +package universe.sparkle.domain.exception + +sealed class BusinessException( + open val code: Int, + override val message: String, +) : RuntimeException(message) { + + // 404 Not Found + sealed class NotFound( + override val code: Int, + override val message: String, + ) : BusinessException(code, message) + + // 406 Not Acceptable + sealed class NotAcceptable( + override val code: Int, + override val message: String, + ) : BusinessException(code, message) + + // 409 Conflict + sealed class Conflict( + override val code: Int, + override val message: String, + ) : BusinessException(code, message) + + // 415 Unsupported Media Type + sealed class UnsupportedMediaType( + override val code: Int, + override val message: String, + ) : BusinessException(code, message) + + // 500 Internal Server Error + sealed class InternalServerError( + override val code: Int, + override val message: String, + ) : BusinessException(code, message) + + // 503 Service Unavailable + sealed class ServiceUnavailable( + override val code: Int, + override val message: String, + ) : BusinessException(code, message) +} From b43471f25defdf0c7ff3a6bf038c68f99ad3645a Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:42:58 +0900 Subject: [PATCH 06/57] feat: Add Unauthorized --- .../universe/sparkle/domain/exception/Unauthorized.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt new file mode 100644 index 0000000..4bbc5a0 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class Unauthorized( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From 6835a7e30148d5a5ba9c448fa5e822dbaba8ac48 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:46:29 +0900 Subject: [PATCH 07/57] feat: separate sealed class --- .../domain/exception/BusinessException.kt | 39 +------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt index 2f871d8..a0a5a9a 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BusinessException.kt @@ -3,41 +3,4 @@ package universe.sparkle.domain.exception sealed class BusinessException( open val code: Int, override val message: String, -) : RuntimeException(message) { - - // 404 Not Found - sealed class NotFound( - override val code: Int, - override val message: String, - ) : BusinessException(code, message) - - // 406 Not Acceptable - sealed class NotAcceptable( - override val code: Int, - override val message: String, - ) : BusinessException(code, message) - - // 409 Conflict - sealed class Conflict( - override val code: Int, - override val message: String, - ) : BusinessException(code, message) - - // 415 Unsupported Media Type - sealed class UnsupportedMediaType( - override val code: Int, - override val message: String, - ) : BusinessException(code, message) - - // 500 Internal Server Error - sealed class InternalServerError( - override val code: Int, - override val message: String, - ) : BusinessException(code, message) - - // 503 Service Unavailable - sealed class ServiceUnavailable( - override val code: Int, - override val message: String, - ) : BusinessException(code, message) -} +) : RuntimeException(message) From ff3067614e011a2e9b6d4b0a8a849ad3a732966e Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:46:42 +0900 Subject: [PATCH 08/57] feat: Add Conflict Exception --- .../kotlin/universe/sparkle/domain/exception/Conflict.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/Conflict.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Conflict.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Conflict.kt new file mode 100644 index 0000000..4e8df49 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Conflict.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class Conflict( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From 80aea768ae43a8d20de878637847d6ee207e9ca1 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:46:52 +0900 Subject: [PATCH 09/57] feat: Add NotFound Exception --- .../kotlin/universe/sparkle/domain/exception/NotFound.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotFound.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotFound.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotFound.kt new file mode 100644 index 0000000..26bd26f --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotFound.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class NotFound( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From 05f1f50aeff1d487930a7068615b75ed248ea293 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:47:06 +0900 Subject: [PATCH 10/57] feat: Add ServiceUnavailable Exception --- .../universe/sparkle/domain/exception/ServiceUnavailable.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/ServiceUnavailable.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/ServiceUnavailable.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/ServiceUnavailable.kt new file mode 100644 index 0000000..e6eb83d --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/ServiceUnavailable.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class ServiceUnavailable( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From c75e6dd47372390e78265579e2fdf236d29b062b Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:47:13 +0900 Subject: [PATCH 11/57] feat: Add InternalServerError Exception --- .../sparkle/domain/exception/InternalServerError.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/InternalServerError.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/InternalServerError.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/InternalServerError.kt new file mode 100644 index 0000000..e99eace --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/InternalServerError.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class InternalServerError( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From 433ce28aaa175f9cecdebe3cbc5c7f7f5469c956 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:47:21 +0900 Subject: [PATCH 12/57] feat: Add NotAcceptable Exception --- .../universe/sparkle/domain/exception/NotAcceptable.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotAcceptable.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotAcceptable.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotAcceptable.kt new file mode 100644 index 0000000..7d7b318 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/NotAcceptable.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class NotAcceptable( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From e496c2ca1964cda28681675d53110c660d0d5de1 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 16:59:05 +0900 Subject: [PATCH 13/57] feat: Add UnsupportedMediaType Exception --- .../sparkle/domain/exception/UnsupportedMediaType.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/exception/UnsupportedMediaType.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/UnsupportedMediaType.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/UnsupportedMediaType.kt new file mode 100644 index 0000000..024640e --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/UnsupportedMediaType.kt @@ -0,0 +1,6 @@ +package universe.sparkle.domain.exception + +sealed class UnsupportedMediaType( + override val code: Int, + override val message: String, +) : BusinessException(code, message) From 0dcec47bdbae5be982e89d21e09afc0860077bbf Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 17:16:37 +0900 Subject: [PATCH 14/57] feat: Add Bad Request Detail Case --- .../sparkle/domain/exception/BadRequest.kt | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt index 2f455d0..850e4e4 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt @@ -3,4 +3,32 @@ package universe.sparkle.domain.exception sealed class BadRequest( override val code: Int, override val message: String, -) : BusinessException(code, message) +) : BusinessException(code, message) { + data class InvalidRequestMethod( + override val message: String = "잘못된 방식의 요청입니다.", + ) : BadRequest(1001, message) + + data class AlreadyGameCreated( + override val message: String = "이미 승부가 생성되었습니다.", + ) : BadRequest(1002, message) + + data class UserNotExistent( + override val message: String = "존재하지 않는 유저의 요청입니다.", + ) : BadRequest(1003, message) + + data class AlreadyGameDone( + override val message: String = "이미 게임이 종료 되었습니다.", + ) : BadRequest(1004, message) + + data class CoupleNotExistent( + override val message: String = "존재하지 않는 커플의 요청입니다.", + ) : BadRequest(1005, message) + + data class InvalidInviteCode( + override val message: String = "올바르지 않은 초대 코드입니다.", + ) : BadRequest(1006, message) + + data class PartnerResultNotEntered( + override val message: String = "상대방이 아직 결과를 입력하지 않았습니다.", + ) : BadRequest(1007, message) +} From 5ac6c90c3be58d69538b80f636a430b5756ef037 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 17:22:20 +0900 Subject: [PATCH 15/57] feat: Add Unauthorized Detail Case --- .../sparkle/domain/exception/BadRequest.kt | 4 ++-- .../sparkle/domain/exception/Unauthorized.kt | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt index 850e4e4..9097e83 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/BadRequest.kt @@ -1,8 +1,8 @@ package universe.sparkle.domain.exception sealed class BadRequest( - override val code: Int, - override val message: String, + code: Int, + message: String, ) : BusinessException(code, message) { data class InvalidRequestMethod( override val message: String = "잘못된 방식의 요청입니다.", diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt index 4bbc5a0..f063fda 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/exception/Unauthorized.kt @@ -1,6 +1,18 @@ package universe.sparkle.domain.exception sealed class Unauthorized( - override val code: Int, - override val message: String, -) : BusinessException(code, message) + code: Int, + message: String, +) : BusinessException(code, message) { + data class TokenNotExistent( + override val message: String = "토큰 값이 존재하지 않습니다.", + ) : Unauthorized(2001, message) + + data class ExpiredToken( + override val message: String = "토큰이 만료 되었습니다.", + ) : Unauthorized(2002, message) + + data class UnsupportedToken( + override val message: String = "지원하지 않는 방식의 토큰 혹은 변조된 토큰을 사용한 경우입니다.", + ) : Unauthorized(2003, message) +} From 513254bd64b213f46890f16427a7c1e1ae289b4f Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 17:22:35 +0900 Subject: [PATCH 16/57] feat: Add Sns Auth Type --- .../src/main/kotlin/universe/sparkle/domain/SnsType.kt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt new file mode 100644 index 0000000..a4f029d --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt @@ -0,0 +1,5 @@ +package universe.sparkle.domain + +enum class SnsType { + KAKAO, GOOGLE, APPLE +} From b697451828f120643ee83d3d3ca8cd1862db8490 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 19:57:37 +0900 Subject: [PATCH 17/57] feat: Add SnsType --- .../src/main/kotlin/universe/sparkle/domain/SnsType.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt index a4f029d..e52a3f8 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt @@ -1,5 +1,12 @@ package universe.sparkle.domain enum class SnsType { - KAKAO, GOOGLE, APPLE + KAKAO, GOOGLE, APPLE; + + companion object { + fun findSnsTypeBy(snsTypeName: String) : SnsType { + return values().find { it.name == snsTypeName } + ?: throw IllegalArgumentException("Unsupported social login type: $snsTypeName") + } + } } From bda9cbd882e93402bb87a5db65954d598c8d4afa Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 19:57:49 +0900 Subject: [PATCH 18/57] feat: Add SnsType attribute convertor --- .../converter/SnsTypeAttributeConverter.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/converter/SnsTypeAttributeConverter.kt diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/converter/SnsTypeAttributeConverter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/converter/SnsTypeAttributeConverter.kt new file mode 100644 index 0000000..480859f --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/converter/SnsTypeAttributeConverter.kt @@ -0,0 +1,18 @@ +package universe.sparkle.infrastructure.persistence.entity.converter + +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter +import universe.sparkle.domain.SnsType + +@Converter +class SnsTypeAttributeConverter : AttributeConverter { + + override fun convertToDatabaseColumn(attribute: SnsType?): String { + return attribute?.name ?: throw IllegalArgumentException("can not convert SnsType to database column") + } + + override fun convertToEntityAttribute(dbData: String?): SnsType { + return dbData?.let { SnsType.findSnsTypeBy(it) } + ?: throw IllegalArgumentException("DB data is not null") + } +} From 455bcc81402043f41f0048605cd20b2bc5651531 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 20:01:12 +0900 Subject: [PATCH 19/57] feat: Add UserEntity --- .../persistence/entity/UserEntity.kt | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt new file mode 100644 index 0000000..8b48e6a --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt @@ -0,0 +1,49 @@ +package universe.sparkle.infrastructure.persistence.entity + +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.GenerationType +import jakarta.persistence.Id +import jakarta.persistence.Table +import universe.sparkle.domain.SnsType +import universe.sparkle.infrastructure.persistence.entity.converter.SnsTypeAttributeConverter + +@Entity +@Table(name = "user") +class UserEntity( + id: Long? = null, + snsType: SnsType, + snsAuthCode: String, + nickname: String? = null, + image: String? = null, + fcmToken: String? = null, +) { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "user_id") + var id: Long? = id + protected set + + @Convert(converter = SnsTypeAttributeConverter::class) + @Column(name = "sns_type", nullable = false) + var snsType: SnsType = snsType + protected set + + @Column(name = "sns_auth", nullable = false) + var snsAuthCode: String = snsAuthCode + protected set + + @Column(name = "nickname", length = 10) + var nickname: String? = nickname + protected set + + @Column(name = "image") + var image: String? = image + protected set + + @Column(name = "fcm_token") + var fcmToken: String? = fcmToken + protected set +} From 7c7abc00e1d2a354b78c1a77689826efbd5d8f50 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:00:59 +0900 Subject: [PATCH 20/57] feat: Add UserEntity --- .../sparkle/infrastructure/persistence/entity/UserEntity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt index 8b48e6a..10cb160 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt @@ -12,7 +12,7 @@ import universe.sparkle.infrastructure.persistence.entity.converter.SnsTypeAttri @Entity @Table(name = "user") -class UserEntity( +internal class UserEntity( id: Long? = null, snsType: SnsType, snsAuthCode: String, From 947985647a330e456ce49c6141076b4b851764ba Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:01:14 +0900 Subject: [PATCH 21/57] feat: Add User detail for security --- .../infrastructure/security/UserDetail.kt | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt index ffa4183..9aba412 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt @@ -1,37 +1,44 @@ package universe.sparkle.infrastructure.security import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.authority.SimpleGrantedAuthority import org.springframework.security.core.userdetails.UserDetails +import universe.sparkle.domain.model.User +import java.util.stream.Collectors class UserDetail private constructor( private val id: Long, - private val nickname: -): UserDetails { + private val nickname: String?, + private val snsAuthCode: String, + private val authorities: List = listOf(SimpleGrantedAuthority("User")), + val image: String?, +) : UserDetails { override fun getAuthorities(): MutableCollection { - TODO("Not yet implemented") + return authorities.stream().collect( + Collectors.toSet(), + ) } - override fun getPassword(): String { - TODO("Not yet implemented") - } + override fun getPassword(): String = snsAuthCode - override fun getUsername(): String { - TODO("Not yet implemented") - } + override fun getUsername(): String? = nickname - override fun isAccountNonExpired(): Boolean { - TODO("Not yet implemented") - } + override fun isAccountNonExpired(): Boolean = true - override fun isAccountNonLocked(): Boolean { - TODO("Not yet implemented") - } + override fun isAccountNonLocked(): Boolean = true - override fun isCredentialsNonExpired(): Boolean { - TODO("Not yet implemented") - } + override fun isCredentialsNonExpired(): Boolean = true + + override fun isEnabled(): Boolean = true - override fun isEnabled(): Boolean { - TODO("Not yet implemented") + companion object { + fun of(user: User): UserDetail { + return UserDetail( + id = 0, + nickname = user.nickname, + snsAuthCode = user.snsAuthCode, + image = user.image + ) + } } } From 1b82d7472aed4511e4f052e906830b842dd79acb Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:01:24 +0900 Subject: [PATCH 22/57] feat: Add user domain model --- .../universe/sparkle/domain/model/User.kt | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt new file mode 100644 index 0000000..34e345c --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt @@ -0,0 +1,33 @@ +package universe.sparkle.domain.model + +import universe.sparkle.domain.SnsType + +data class User( + val id: Long, + val snsType: SnsType, + val snsAuthCode: String, + val nickname: String?, + val image: String?, + val fcmToken: String?, +) { + + init { + validNickname(nickname) + } + + fun updateProfile(updateNickname: String?, updateImage: String?): User { + validNickname(updateNickname) + return copy( + id = this.id, + snsType = this.snsType, + snsAuthCode = this.snsAuthCode, + nickname = updateNickname, + image = updateImage, + fcmToken = this.fcmToken, + ) + } + + private fun validNickname(value: String?) { + require(value?.let { it.length > 10 } ?: true) + } +} From fca4a37d7fdd6edd169c2d4652f0e70f3e82fd5d Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:01:31 +0900 Subject: [PATCH 23/57] feat: Add user mapper --- .../persistence/mapper/UserMapper.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt new file mode 100644 index 0000000..f0a8d6e --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt @@ -0,0 +1,14 @@ +package universe.sparkle.infrastructure.persistence.mapper + +import universe.sparkle.domain.model.User +import universe.sparkle.infrastructure.persistence.entity.UserEntity +import java.lang.IllegalArgumentException + +internal fun UserEntity.toDomain() = User( + id = this.id ?: throw IllegalArgumentException("ID has not been initialized yet"), + snsType = this.snsType, + snsAuthCode = this.snsAuthCode, + nickname = this.nickname, + image = this.image, + fcmToken = this.fcmToken, +) From 8591671223b23282c602bbb060b85bd88f635ecc Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:02:01 +0900 Subject: [PATCH 24/57] style: add comma --- .../universe/sparkle/infrastructure/security/UserDetail.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt index 9aba412..5617c93 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt @@ -37,7 +37,7 @@ class UserDetail private constructor( id = 0, nickname = user.nickname, snsAuthCode = user.snsAuthCode, - image = user.image + image = user.image, ) } } From 1f3cf3c7659e236a9f149365f8a4a21e324cbb9c Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:03:56 +0900 Subject: [PATCH 25/57] feat: change private id to public --- .../universe/sparkle/infrastructure/security/UserDetail.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt index 5617c93..fc40bd8 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt @@ -7,7 +7,7 @@ import universe.sparkle.domain.model.User import java.util.stream.Collectors class UserDetail private constructor( - private val id: Long, + val id: Long, private val nickname: String?, private val snsAuthCode: String, private val authorities: List = listOf(SimpleGrantedAuthority("User")), From dc1b158f30823c38e1ff6095721bcbfa369c1a15 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:08:11 +0900 Subject: [PATCH 26/57] feat: Create LoadUserInputBoundary --- .../universe/sparkle/domain/usecase/LoadUserInputBoundary.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt new file mode 100644 index 0000000..9381e3b --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt @@ -0,0 +1,4 @@ +package universe.sparkle.domain.usecase + +interface LoadUserInputBoundary { +} From 1de913bfd135459ddd33cf6eaf2c14915ee204f6 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Mon, 18 Sep 2023 21:13:47 +0900 Subject: [PATCH 27/57] feat: Create UserGateway --- .../kotlin/universe/sparkle/domain/gateway/UserGateway.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt new file mode 100644 index 0000000..19f8cbe --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt @@ -0,0 +1,4 @@ +package universe.sparkle.domain.gateway + +interface UserGateway { +} From 3e9309542fcf0b7c7c5e50b970aac68a992b334f Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 00:33:43 +0900 Subject: [PATCH 28/57] feat: Add User find feature --- module-domain/build.gradle | 1 + .../kotlin/universe/sparkle/domain/SnsType.kt | 2 +- .../sparkle/domain/gateway/UserGateway.kt | 5 ++ .../universe/sparkle/domain/model/User.kt | 8 +-- module-infrastructure/build.gradle | 3 ++ .../infrastructure/ModuleApiApplication.kt | 11 ---- .../infrastructure/SparkleApplication.kt | 13 +++++ .../persistence/entity/UserEntity.kt | 2 +- .../persistence/gateway/UserAdapter.kt | 30 +++++++++++ .../persistence/mapper/UserMapper.kt | 11 +++- .../repository/UserJpaRepository.kt | 6 +++ .../ModuleApiApplicationTests.kt | 12 ----- .../persistence/gateway/UserAdapterTest.kt | 45 ++++++++++++++++ .../persistence/mapper/UserMapperTest.kt | 51 +++++++++++++++++++ .../repository/UserJpaRepositoryTest.kt | 40 +++++++++++++++ module-usecase/build.gradle | 1 + .../sparkle/usecase/user/LoadUserUserCase.kt | 7 +++ settings.gradle | 3 ++ 18 files changed, 221 insertions(+), 30 deletions(-) delete mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/SparkleApplication.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepository.kt delete mode 100644 module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt create mode 100644 module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapterTest.kt create mode 100644 module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapperTest.kt create mode 100644 module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt create mode 100644 module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt diff --git a/module-domain/build.gradle b/module-domain/build.gradle index 20e82d4..245885d 100644 --- a/module-domain/build.gradle +++ b/module-domain/build.gradle @@ -21,6 +21,7 @@ dependencies { implementation libs.kotlin.reflect testImplementation libs.test.junit5.api testRuntimeOnly libs.test.junit5.engine + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } tasks.named('test') { diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt index e52a3f8..fd99eca 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/SnsType.kt @@ -4,7 +4,7 @@ enum class SnsType { KAKAO, GOOGLE, APPLE; companion object { - fun findSnsTypeBy(snsTypeName: String) : SnsType { + fun findSnsTypeBy(snsTypeName: String): SnsType { return values().find { it.name == snsTypeName } ?: throw IllegalArgumentException("Unsupported social login type: $snsTypeName") } diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt index 19f8cbe..5a3257e 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt @@ -1,4 +1,9 @@ package universe.sparkle.domain.gateway +import universe.sparkle.domain.SnsType +import universe.sparkle.domain.model.User + interface UserGateway { + fun findUserById(userId: Long): User + fun saveUser(user: User) } diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt index 34e345c..7068abb 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt @@ -3,12 +3,12 @@ package universe.sparkle.domain.model import universe.sparkle.domain.SnsType data class User( - val id: Long, + val id: Long? = null, val snsType: SnsType, val snsAuthCode: String, - val nickname: String?, - val image: String?, - val fcmToken: String?, + val nickname: String? = null, + val image: String? = null, + val fcmToken: String? = null, ) { init { diff --git a/module-infrastructure/build.gradle b/module-infrastructure/build.gradle index 31c72f8..dd9f9d6 100644 --- a/module-infrastructure/build.gradle +++ b/module-infrastructure/build.gradle @@ -46,8 +46,11 @@ dependencies { developmentOnly libs.spring.boot.devtools + implementation libs.db.mysql + testImplementation libs.test.spring.boot.starter testImplementation libs.test.spring.security + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } allOpen { diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt deleted file mode 100644 index 3bc1469..0000000 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/ModuleApiApplication.kt +++ /dev/null @@ -1,11 +0,0 @@ -package universe.sparkle.infrastructure - -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication - -@SpringBootApplication -class ModuleApiApplication - -fun main(args: Array) { - runApplication(*args) -} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/SparkleApplication.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/SparkleApplication.kt new file mode 100644 index 0000000..51e38b3 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/SparkleApplication.kt @@ -0,0 +1,13 @@ +package universe.sparkle.infrastructure + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication +import org.springframework.context.annotation.ComponentScan + +@SpringBootApplication +@ComponentScan(basePackages = ["universe.sparkle.infrastructure", "universe.sparkle.usecase"]) +class SparkleApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt index 10cb160..8b48e6a 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/UserEntity.kt @@ -12,7 +12,7 @@ import universe.sparkle.infrastructure.persistence.entity.converter.SnsTypeAttri @Entity @Table(name = "user") -internal class UserEntity( +class UserEntity( id: Long? = null, snsType: SnsType, snsAuthCode: String, diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt new file mode 100644 index 0000000..d2896a0 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt @@ -0,0 +1,30 @@ +package universe.sparkle.infrastructure.persistence.gateway + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.data.repository.findByIdOrNull +import org.springframework.stereotype.Component +import org.springframework.stereotype.Repository +import universe.sparkle.domain.exception.BadRequest +import universe.sparkle.domain.gateway.UserGateway +import universe.sparkle.domain.model.User +import universe.sparkle.infrastructure.persistence.entity.UserEntity +import universe.sparkle.infrastructure.persistence.mapper.toDomain +import universe.sparkle.infrastructure.persistence.mapper.toEntity +import universe.sparkle.infrastructure.persistence.repository.UserJpaRepository + +@Repository +internal class UserAdapter @Autowired constructor( + private val userJpaRepository: UserJpaRepository, +) : UserGateway { + + override fun findUserById(userId: Long): User { + val userEntity: UserEntity = userJpaRepository.findByIdOrNull(userId) + ?: throw BadRequest.UserNotExistent() + return userEntity.toDomain() + } + + override fun saveUser(user: User) { + user.toEntity() + .also { userEntity -> userJpaRepository.save(userEntity) } + } +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt index f0a8d6e..b61ceec 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapper.kt @@ -4,7 +4,7 @@ import universe.sparkle.domain.model.User import universe.sparkle.infrastructure.persistence.entity.UserEntity import java.lang.IllegalArgumentException -internal fun UserEntity.toDomain() = User( +fun UserEntity.toDomain() = User( id = this.id ?: throw IllegalArgumentException("ID has not been initialized yet"), snsType = this.snsType, snsAuthCode = this.snsAuthCode, @@ -12,3 +12,12 @@ internal fun UserEntity.toDomain() = User( image = this.image, fcmToken = this.fcmToken, ) + +fun User.toEntity() = UserEntity( + id = this.id, + snsType = this.snsType, + snsAuthCode = this.snsAuthCode, + nickname = this.nickname, + image = this.image, + fcmToken = this.fcmToken, +) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepository.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepository.kt new file mode 100644 index 0000000..766267a --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepository.kt @@ -0,0 +1,6 @@ +package universe.sparkle.infrastructure.persistence.repository + +import org.springframework.data.jpa.repository.JpaRepository +import universe.sparkle.infrastructure.persistence.entity.UserEntity + +interface UserJpaRepository : JpaRepository diff --git a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt deleted file mode 100644 index 9a5e224..0000000 --- a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/ModuleApiApplicationTests.kt +++ /dev/null @@ -1,12 +0,0 @@ -package universe.sparkle.infrastructure - -import org.junit.jupiter.api.Test -import org.springframework.boot.test.context.SpringBootTest - -@SpringBootTest -class ModuleApiApplicationTests { - - @Test - fun contextLoads() { - } -} diff --git a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapterTest.kt b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapterTest.kt new file mode 100644 index 0000000..62ec978 --- /dev/null +++ b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapterTest.kt @@ -0,0 +1,45 @@ +package universe.sparkle.infrastructure.persistence.gateway + +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatThrownBy +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import universe.sparkle.domain.SnsType +import universe.sparkle.domain.exception.BadRequest +import universe.sparkle.domain.gateway.UserGateway +import universe.sparkle.domain.model.User + +@DataJpaTest +@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) +class UserAdapterTest @Autowired constructor( + private val userAdapter: UserGateway, +) { + @Test + fun 지정된_아이디로_유저를_찾을_수_있다() { + // given + 유저_아이디_1인_유저를_저장한다() + // when + val actualUser = userAdapter.findUserById(1L) + // then + assertThat(actualUser.id).isEqualTo(1L) + } + + private fun 유저_아이디_1인_유저를_저장한다() { + User( + id = 1L, + snsType = SnsType.KAKAO, + snsAuthCode = "Test", + ).also { user -> + userAdapter.saveUser(user) + } + } + + @Test + fun 유저가_존재하지_않는다면_유저가_없다는_에러를_띄워야한다() { + assertThatThrownBy { userAdapter.findUserById(1L) } + .isInstanceOf(BadRequest.UserNotExistent::class.java) + .hasMessage("존재하지 않는 유저의 요청입니다.") + } +} diff --git a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapperTest.kt b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapperTest.kt new file mode 100644 index 0000000..67bbab1 --- /dev/null +++ b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/mapper/UserMapperTest.kt @@ -0,0 +1,51 @@ +package universe.sparkle.infrastructure.persistence.mapper + +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatThrownBy +import org.junit.jupiter.api.Test +import universe.sparkle.domain.SnsType +import universe.sparkle.domain.model.User +import universe.sparkle.infrastructure.persistence.entity.UserEntity + +class UserMapperTest { + @Test + fun 유저_엔티티를_도메인_모델로_변경할_수_있다() { + // given + val expectedUserEntity = UserEntity( + id = 1L, + snsType = SnsType.APPLE, + snsAuthCode = "testAuthCode", + ) + // when + val user = expectedUserEntity.toDomain() + // then + assertThat(user).isInstanceOf(User::class.java) + } + + @Test + fun 유저_도메인_모델을_엔티티로_변경할_수_있다() { + // given + val expectedUser = User( + snsType = SnsType.GOOGLE, + snsAuthCode = "test", + ) + // when + val userEntity = expectedUser.toEntity() + // then + assertThat(userEntity).isInstanceOf(UserEntity::class.java) + } + + @Test + fun 유저_엔티티에서_아이디가_지정되지_않으면_도메인_모델로_변경_할_수_없다() { + // given + val expectedUserEntity = UserEntity( + snsType = SnsType.APPLE, + snsAuthCode = "testAuthCode", + ) + // when + // then + assertThatThrownBy { expectedUserEntity.toDomain() } + .isInstanceOf(IllegalArgumentException::class.java) + .hasMessage("ID has not been initialized yet") + } +} diff --git a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt new file mode 100644 index 0000000..7dfeabd --- /dev/null +++ b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt @@ -0,0 +1,40 @@ +package universe.sparkle.infrastructure.persistence.repository + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.assertAll +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.CsvSource +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import universe.sparkle.domain.SnsType +import universe.sparkle.infrastructure.persistence.entity.UserEntity +import universe.sparkle.infrastructure.persistence.repository.UserJpaRepository + +@DataJpaTest +@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) +class UserJpaRepositoryTest @Autowired constructor( + private val userJpaRepository: UserJpaRepository, +) { + + @ParameterizedTest + @CsvSource("KAKAO,kakaoTestAuthCode", "GOOGLE, googleTestAuthCode", "APPLE, appleTestAuthCode") + fun 유저의_소설_로그인_정보가_주어지면_유저를_생성하여_유저를_저장할_수_있다( + expectedSnsType: SnsType, + expectedAuthCode: String, + ) { + // given + val expectedUser = UserEntity( + snsType = expectedSnsType, + snsAuthCode = expectedAuthCode, + ) + // when + val actualUser = userJpaRepository.save(expectedUser) + // then + assertAll( + { assertThat(actualUser.id).isNotNull() }, + { assertThat(actualUser.snsType).isEqualTo(expectedSnsType) }, + { assertThat(actualUser.snsAuthCode).isEqualTo(expectedAuthCode) }, + ) + } +} diff --git a/module-usecase/build.gradle b/module-usecase/build.gradle index 7fd38cb..eab1835 100644 --- a/module-usecase/build.gradle +++ b/module-usecase/build.gradle @@ -31,6 +31,7 @@ dependencies { implementation libs.test.spring.boot.starter implementation libs.kotlin.reflect testImplementation libs.test.spring.boot.starter + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } tasks.named('test') { diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt new file mode 100644 index 0000000..3edee50 --- /dev/null +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt @@ -0,0 +1,7 @@ +package universe.sparkle.usecase.user + +class LoadUserUserCase { + operator fun invoke(userId: String) { + + } +} diff --git a/settings.gradle b/settings.gradle index 59b7aca..52e5644 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,6 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} rootProject.name = 'sparkle' include("module-infrastructure") From 80bb3b3b1c49b738697579af7a705c6a91695b03 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 00:37:09 +0900 Subject: [PATCH 29/57] build: Add jwt category bundle --- gradle/libs.versions.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f21800a..123cd76 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,3 +62,8 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } # kotlin [bundles] +jjwt = [ + "jjwt-api", + "jjwt-impl", + "jjwt-jackson" +] From d0e018fad1499d49298364e6a342f2beef3ec33e Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 00:41:16 +0900 Subject: [PATCH 30/57] build: Add springdoc dependency --- module-infrastructure/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/module-infrastructure/build.gradle b/module-infrastructure/build.gradle index dd9f9d6..d315a63 100644 --- a/module-infrastructure/build.gradle +++ b/module-infrastructure/build.gradle @@ -44,10 +44,13 @@ dependencies { implementation libs.jackson.kotlin implementation libs.kotlin.reflect - developmentOnly libs.spring.boot.devtools - implementation libs.db.mysql + implementation libs.bundles.jjwt + + implementation libs.springdoc + developmentOnly libs.spring.boot.devtools + testImplementation libs.test.spring.boot.starter testImplementation libs.test.spring.security implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" From 9d4f244acb2d3193db07f3fd31627eab8fff785b Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 01:15:20 +0900 Subject: [PATCH 31/57] feat: Add JwtConfig file --- .../universe/sparkle/infrastructure/config/JwtConfig.kt | 8 ++++++++ uni-kotlin-config | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt new file mode 100644 index 0000000..142ab27 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt @@ -0,0 +1,8 @@ +package universe.sparkle.infrastructure.config + +import org.springframework.context.annotation.Configuration + +@Configuration +class JwtConfig { + +} diff --git a/uni-kotlin-config b/uni-kotlin-config index 1046438..e24a452 160000 --- a/uni-kotlin-config +++ b/uni-kotlin-config @@ -1 +1 @@ -Subproject commit 1046438b497e516028feaee672cf2b4af15a113f +Subproject commit e24a4520a5e3f83afb59925fe505dd84a619b9b5 From b468e631d993c83f32c84393e27260961ea40d73 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 01:36:30 +0900 Subject: [PATCH 32/57] feat: Add jwt value property in JwtConfig --- .../universe/sparkle/infrastructure/config/JwtConfig.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt index 142ab27..a3c0a45 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt @@ -1,8 +1,11 @@ package universe.sparkle.infrastructure.config +import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Configuration @Configuration -class JwtConfig { - -} +data class JwtConfig( + @Value("\${jwt.secret}") val secret: String, + @Value("\${jwt.accessExpiryPeriodDay}") val accessExpiryPeriodDay: Int, + @Value("\${jwt.refreshExpiryPeriodDay}") val refreshExpiryPeriodDay: Int, +) From bb31d1b337303c5097bf1c6374bb5d79c60c8516 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 01:59:37 +0900 Subject: [PATCH 33/57] style: fix style --- module-domain/build.gradle | 1 - .../universe/sparkle/domain/gateway/UserGateway.kt | 1 - .../sparkle/domain/usecase/LoadUserInputBoundary.kt | 3 +-- module-infrastructure/build.gradle | 3 --- .../persistence/gateway/UserAdapter.kt | 1 - .../persistence/repository/UserJpaRepositoryTest.kt | 1 - module-usecase/build.gradle | 3 ++- .../sparkle/usecase/user/LoadUserUserCase.kt | 1 - .../sparkle/usecase/ModuleServiceApplicationTests.kt | 12 ------------ uni-kotlin-config | 2 +- 10 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt diff --git a/module-domain/build.gradle b/module-domain/build.gradle index 245885d..20e82d4 100644 --- a/module-domain/build.gradle +++ b/module-domain/build.gradle @@ -21,7 +21,6 @@ dependencies { implementation libs.kotlin.reflect testImplementation libs.test.junit5.api testRuntimeOnly libs.test.junit5.engine - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } tasks.named('test') { diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt index 5a3257e..3b306bf 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserGateway.kt @@ -1,6 +1,5 @@ package universe.sparkle.domain.gateway -import universe.sparkle.domain.SnsType import universe.sparkle.domain.model.User interface UserGateway { diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt index 9381e3b..12d724e 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/LoadUserInputBoundary.kt @@ -1,4 +1,3 @@ package universe.sparkle.domain.usecase -interface LoadUserInputBoundary { -} +interface LoadUserInputBoundary diff --git a/module-infrastructure/build.gradle b/module-infrastructure/build.gradle index d315a63..2f8e8b8 100644 --- a/module-infrastructure/build.gradle +++ b/module-infrastructure/build.gradle @@ -46,14 +46,11 @@ dependencies { implementation libs.db.mysql - implementation libs.bundles.jjwt - implementation libs.springdoc developmentOnly libs.spring.boot.devtools testImplementation libs.test.spring.boot.starter testImplementation libs.test.spring.security - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } allOpen { diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt index d2896a0..016ed30 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/gateway/UserAdapter.kt @@ -2,7 +2,6 @@ package universe.sparkle.infrastructure.persistence.gateway import org.springframework.beans.factory.annotation.Autowired import org.springframework.data.repository.findByIdOrNull -import org.springframework.stereotype.Component import org.springframework.stereotype.Repository import universe.sparkle.domain.exception.BadRequest import universe.sparkle.domain.gateway.UserGateway diff --git a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt index 7dfeabd..e74d040 100644 --- a/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt +++ b/module-infrastructure/src/test/kotlin/universe/sparkle/infrastructure/persistence/repository/UserJpaRepositoryTest.kt @@ -9,7 +9,6 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabas import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import universe.sparkle.domain.SnsType import universe.sparkle.infrastructure.persistence.entity.UserEntity -import universe.sparkle.infrastructure.persistence.repository.UserJpaRepository @DataJpaTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) diff --git a/module-usecase/build.gradle b/module-usecase/build.gradle index eab1835..59564dd 100644 --- a/module-usecase/build.gradle +++ b/module-usecase/build.gradle @@ -31,7 +31,8 @@ dependencies { implementation libs.test.spring.boot.starter implementation libs.kotlin.reflect testImplementation libs.test.spring.boot.starter - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + + implementation libs.bundles.jjwt } tasks.named('test') { diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt index 3edee50..d43e9fa 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt @@ -2,6 +2,5 @@ package universe.sparkle.usecase.user class LoadUserUserCase { operator fun invoke(userId: String) { - } } diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt deleted file mode 100644 index 586fb54..0000000 --- a/module-usecase/src/test/kotlin/universe/sparkle/usecase/ModuleServiceApplicationTests.kt +++ /dev/null @@ -1,12 +0,0 @@ -package universe.sparkle.usecase - -import org.junit.jupiter.api.Test -import org.springframework.boot.test.context.SpringBootTest - -@SpringBootTest -class ModuleServiceApplicationTests { - - @Test - fun contextLoads() { - } -} diff --git a/uni-kotlin-config b/uni-kotlin-config index e24a452..44e4f11 160000 --- a/uni-kotlin-config +++ b/uni-kotlin-config @@ -1 +1 @@ -Subproject commit e24a4520a5e3f83afb59925fe505dd84a619b9b5 +Subproject commit 44e4f113d46cc38cbf88c4e09618847c803be547 From d3482debabf93c2384d5e2896552feb96762a33c Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 02:00:16 +0900 Subject: [PATCH 34/57] style: fix typo --- .../universe/sparkle/infrastructure/config/JwtConfig.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt index a3c0a45..2282fba 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt @@ -6,6 +6,6 @@ import org.springframework.context.annotation.Configuration @Configuration data class JwtConfig( @Value("\${jwt.secret}") val secret: String, - @Value("\${jwt.accessExpiryPeriodDay}") val accessExpiryPeriodDay: Int, - @Value("\${jwt.refreshExpiryPeriodDay}") val refreshExpiryPeriodDay: Int, + @Value("\${jwt.accessExpiryPeriodDay}") val accessExpiryPeriodDay: Long, + @Value("\${jwt.refreshExpiryPeriodDay}") val refreshExpiryPeriodDay: Long, ) From 1df56ae6042629d8a78ad580eebdeeb36e4e3359 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 05:53:52 +0900 Subject: [PATCH 35/57] build: Add Mockk Dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mockito 의존성 제거 및 mockK 의존성 추가 --- module-usecase/build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module-usecase/build.gradle b/module-usecase/build.gradle index 59564dd..092ff32 100644 --- a/module-usecase/build.gradle +++ b/module-usecase/build.gradle @@ -28,11 +28,17 @@ repositories { } dependencies { + implementation project(':module-domain') implementation libs.test.spring.boot.starter implementation libs.kotlin.reflect - testImplementation libs.test.spring.boot.starter implementation libs.bundles.jjwt + + testImplementation(libs.test.spring.boot.starter) { + exclude module: 'mockito-core' + } + testImplementation libs.test.mockk + } tasks.named('test') { From 38f6e459f5f9b9f87f1a3dd544ff06e5b4fc1e3a Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:09:43 +0900 Subject: [PATCH 36/57] build: Add JwtConfigContract --- .../universe/sparkle/domain/JwtConfigContract.kt | 7 +++++++ .../sparkle/infrastructure/config/JwtConfig.kt | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt new file mode 100644 index 0000000..c18315d --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt @@ -0,0 +1,7 @@ +package universe.sparkle.domain + +interface JwtConfigContract { + fun getSecret(): String + fun getAccessExpiryPeriodDay(): Long + fun getRefreshExpiryPeriodDay(): Long +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt index 2282fba..57e6cea 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/JwtConfig.kt @@ -2,10 +2,18 @@ package universe.sparkle.infrastructure.config import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Configuration +import universe.sparkle.domain.JwtConfigContract @Configuration data class JwtConfig( - @Value("\${jwt.secret}") val secret: String, - @Value("\${jwt.accessExpiryPeriodDay}") val accessExpiryPeriodDay: Long, - @Value("\${jwt.refreshExpiryPeriodDay}") val refreshExpiryPeriodDay: Long, -) + @Value("\${jwt.secret}") private val _secret: String, + @Value("\${jwt.accessExpiryPeriodDay}") private val _accessExpiryPeriodDay: Long, + @Value("\${jwt.refreshExpiryPeriodDay}") private val _refreshExpiryPeriodDay: Long, +) : JwtConfigContract { + + override fun getSecret() = _secret + + override fun getAccessExpiryPeriodDay() = _accessExpiryPeriodDay + + override fun getRefreshExpiryPeriodDay() = _refreshExpiryPeriodDay +} From c09072f0cf5e91d6a5969946952883384d26af70 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:10:06 +0900 Subject: [PATCH 37/57] build: Add mockK in version catalog --- gradle/libs.versions.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 123cd76..dc625d0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ springdoc = "2.1.0" jjwt = "0.11.5" kotlin = "1.8.22" ktlint = "11.0.0" +mockk = "1.13.7" service = "0.0.1-SNAPSHOT" @@ -47,6 +48,7 @@ test-spring-boot-starter = { module = "org.springframework.boot:spring-boot-star test-spring-security = { module = "org.springframework.security:spring-security-test" } test-junit5-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } test-junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } +test-mockk = { module = "io.mockk:mockk", version.ref = "mockk" } [plugins] # common From ddb2cbfb08b764c2c90b02e19503c4264beee05f Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:10:29 +0900 Subject: [PATCH 38/57] feat: Add AuthToken Domain Model --- .../main/kotlin/universe/sparkle/domain/model/AuthToken.kt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthToken.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthToken.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthToken.kt new file mode 100644 index 0000000..d0928e0 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthToken.kt @@ -0,0 +1,7 @@ +package universe.sparkle.domain.model + +data class AuthToken( + val accessToken: String, + val refreshToken: String? = null, + val coupleId: Long? = null, +) From c712b8cd097c1afca3a1da7235df92d07e73bd07 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:10:56 +0900 Subject: [PATCH 39/57] feat: Add BeIssuedAuthTokenUseCase --- .../usecase/BeIssuedAuthTokenInputBoundary.kt | 9 +++ .../usecase/user/BeIssuedAuthTokenUseCase.kt | 70 +++++++++++++++++++ .../usecase/BeIssuedAuthTokenUseCaseTest.kt | 52 ++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt create mode 100644 module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt create mode 100644 module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt new file mode 100644 index 0000000..8d2bd7d --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt @@ -0,0 +1,9 @@ +package universe.sparkle.domain.usecase + +import universe.sparkle.domain.model.AuthToken +import universe.sparkle.domain.model.User + +interface BeIssuedAuthTokenInputBoundary { + operator fun invoke(user: User): AuthToken + operator fun invoke(user: User, accessExpiryPeriodDay: Long, refreshExpiryPeriodDay: Long): AuthToken +} diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt new file mode 100644 index 0000000..62c3c79 --- /dev/null +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt @@ -0,0 +1,70 @@ +package universe.sparkle.usecase.user + +import io.jsonwebtoken.Jwts +import io.jsonwebtoken.SignatureAlgorithm +import jakarta.xml.bind.DatatypeConverter +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service +import universe.sparkle.domain.usecase.BeIssuedAuthTokenInputBoundary +import universe.sparkle.domain.JwtConfigContract +import universe.sparkle.domain.model.AuthToken +import universe.sparkle.domain.model.User +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId +import java.util.Date +import javax.crypto.spec.SecretKeySpec + +@Service +class BeIssuedAuthTokenUseCase @Autowired constructor( + private val jwtConfig: JwtConfigContract, +) : BeIssuedAuthTokenInputBoundary { + + private val zoneIdKST = ZoneId.of("Asia/Seoul") + private val signatureAlgorithm = SignatureAlgorithm.HS256 + + override fun invoke( + user: User, + accessExpiryPeriodDay: Long, + refreshExpiryPeriodDay: Long, + ): AuthToken { + val secretKeyBytes = DatatypeConverter.parseBase64Binary(jwtConfig.getSecret()) + val signingKey = SecretKeySpec(secretKeyBytes, signatureAlgorithm.jcaName) + return AuthToken( + accessToken = beIssuedAccessToken(user, accessExpiryPeriodDay, signingKey), + ) + } + + override fun invoke(user: User): AuthToken { + return this.invoke( + user = user, + accessExpiryPeriodDay = jwtConfig.getAccessExpiryPeriodDay(), + refreshExpiryPeriodDay = jwtConfig.getRefreshExpiryPeriodDay(), + ) + } + + private fun beIssuedAccessToken( + user: User, + accessExpiryPeriodDay: Long, + signingKey: SecretKeySpec, + ): String = createExpiration(accessExpiryPeriodDay).let { expirationDay -> + Jwts.builder() + .setClaims(createAccessTokenClaims(user)) + .setExpiration(Date.from(expirationDay)) + .signWith(signingKey, signatureAlgorithm) + .compact() + } + + private fun createAccessTokenClaims(user: User) = Jwts.claims() + .setSubject("AccessToken") + .also { + it["userId"] = user.id + } + + private fun createExpiration(expiryPeriod: Long): Instant = LocalDateTime.now() + .atZone(zoneIdKST) + .toLocalDateTime() + .plusDays(expiryPeriod) + .atZone(zoneIdKST) + .toInstant() +} diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt new file mode 100644 index 0000000..b2eab3d --- /dev/null +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt @@ -0,0 +1,52 @@ +package universe.sparkle.usecase + +import io.mockk.MockKAnnotations +import io.mockk.every +import io.mockk.impl.annotations.InjectMockKs +import io.mockk.impl.annotations.MockK +import io.mockk.junit5.MockKExtension +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertAll +import org.junit.jupiter.api.extension.ExtendWith +import universe.sparkle.domain.JwtConfigContract +import universe.sparkle.domain.SnsType +import universe.sparkle.domain.model.User +import universe.sparkle.usecase.user.BeIssuedAuthTokenUseCase + +@ExtendWith(MockKExtension::class) +class AuthTokenUseCaseTest { + + @MockK + private lateinit var jwtConfig: JwtConfigContract + + @InjectMockKs + private lateinit var beIssuedAuthTokenUseCase: BeIssuedAuthTokenUseCase + + @BeforeEach + fun setUp() { + MockKAnnotations.init(this, relaxed = true, relaxUnitFun = true) + } + + @Test + fun 유저_정보가_주어지면_유저_정보를_통해_인증_토큰을_생성한다() { + // given + every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + val user = User( + id = 1, + snsType = SnsType.APPLE, + snsAuthCode = "test", + ) + // when + val authToken = beIssuedAuthTokenUseCase(user) + // then + assertAll( + { assertThat(authToken.accessToken).isNotNull() }, + { assertThat(authToken.refreshToken).isNull() }, + { assertThat(authToken.coupleId).isNull() }, + ) + } +} From 91d5c9169b11b734aee4d9664fd71a0f1120ff70 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:11:50 +0900 Subject: [PATCH 40/57] feat: Add BeIssuedAuthTokenUseCase --- .../sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt index b2eab3d..502c155 100644 --- a/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt @@ -27,14 +27,14 @@ class AuthTokenUseCaseTest { @BeforeEach fun setUp() { MockKAnnotations.init(this, relaxed = true, relaxUnitFun = true) + every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } } @Test fun 유저_정보가_주어지면_유저_정보를_통해_인증_토큰을_생성한다() { // given - every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } - every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } - every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } val user = User( id = 1, snsType = SnsType.APPLE, From dee41a14bdb8174401d73e6791acb9b4e6cd8935 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:45:12 +0900 Subject: [PATCH 41/57] feat: Move ZoneId to JwtConfigContract Companion --- .../kotlin/universe/sparkle/domain/JwtConfigContract.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt index c18315d..8d18291 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/JwtConfigContract.kt @@ -1,7 +1,13 @@ package universe.sparkle.domain +import java.time.ZoneId + interface JwtConfigContract { fun getSecret(): String fun getAccessExpiryPeriodDay(): Long fun getRefreshExpiryPeriodDay(): Long + + companion object { + val zoneIdKST = ZoneId.of("Asia/Seoul") + } } From dde7b6c9189a7d3f6d6d3716831d3d0bd223b3a2 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:45:37 +0900 Subject: [PATCH 42/57] feat: Add jwt validate usecase --- .../usecase/ValidateTokenInputBoundary.kt | 5 ++ .../usecase/user/ValidateTokenUseCase.kt | 52 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt create mode 100644 module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt new file mode 100644 index 0000000..b5507ba --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt @@ -0,0 +1,5 @@ +package universe.sparkle.domain.usecase + +interface ValidateTokenInputBoundary { + operator fun invoke(token: String) +} diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt new file mode 100644 index 0000000..ca6f134 --- /dev/null +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt @@ -0,0 +1,52 @@ +package universe.sparkle.usecase.user + +import io.jsonwebtoken.Claims +import io.jsonwebtoken.ExpiredJwtException +import io.jsonwebtoken.Jwts +import io.jsonwebtoken.MalformedJwtException +import io.jsonwebtoken.UnsupportedJwtException +import io.jsonwebtoken.security.SignatureException +import jakarta.xml.bind.DatatypeConverter +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service +import universe.sparkle.domain.JwtConfigContract +import universe.sparkle.domain.exception.Unauthorized +import universe.sparkle.domain.usecase.ValidateTokenInputBoundary +import java.time.LocalDateTime + +@Service +class ValidateTokenUseCase @Autowired constructor( + private val jwtConfig: JwtConfigContract, +) : ValidateTokenInputBoundary { + + override fun invoke(token: String) { + if (isExpired(token)) throw Unauthorized.ExpiredToken() + } + + private fun getClaimsFromToken(token: String): Claims { + return runCatching { + Jwts.parserBuilder() + .setSigningKey(DatatypeConverter.parseBase64Binary(jwtConfig.getSecret())) + .build() + .parseClaimsJws(token) + .body + }.getOrElse { + when (it) { + is ExpiredJwtException -> throw Unauthorized.ExpiredToken() + is MalformedJwtException, + is UnsupportedJwtException, + is SignatureException, + -> throw Unauthorized.UnsupportedToken() + + else -> throw IllegalStateException("Problem occurred during JWT processing") + } + } + } + + private fun isExpired(token: String): Boolean { + val claims = getClaimsFromToken(token) + val nowDateTime = LocalDateTime.now(JwtConfigContract.zoneIdKST) + val tokenExpiredDate = claims.expiration.toInstant().atZone(JwtConfigContract.zoneIdKST).toLocalDateTime() + return tokenExpiredDate.isBefore(nowDateTime) + } +} From 7940988dbf76f627464d8e75c0ae2aa1974ad095 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:45:53 +0900 Subject: [PATCH 43/57] feat: Move ZoneId to JwtConfigContract Companion --- .../sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt index 62c3c79..1097ef0 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt @@ -11,7 +11,6 @@ import universe.sparkle.domain.model.AuthToken import universe.sparkle.domain.model.User import java.time.Instant import java.time.LocalDateTime -import java.time.ZoneId import java.util.Date import javax.crypto.spec.SecretKeySpec @@ -20,7 +19,6 @@ class BeIssuedAuthTokenUseCase @Autowired constructor( private val jwtConfig: JwtConfigContract, ) : BeIssuedAuthTokenInputBoundary { - private val zoneIdKST = ZoneId.of("Asia/Seoul") private val signatureAlgorithm = SignatureAlgorithm.HS256 override fun invoke( @@ -62,9 +60,9 @@ class BeIssuedAuthTokenUseCase @Autowired constructor( } private fun createExpiration(expiryPeriod: Long): Instant = LocalDateTime.now() - .atZone(zoneIdKST) + .atZone(JwtConfigContract.zoneIdKST) .toLocalDateTime() .plusDays(expiryPeriod) - .atZone(zoneIdKST) + .atZone(JwtConfigContract.zoneIdKST) .toInstant() } From de4f90e9c0144e24a1960ee67471dd39ca047efa Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:46:42 +0900 Subject: [PATCH 44/57] test: Add unexpired token verification test --- .../usecase/BeIssuedAuthTokenUseCaseTest.kt | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt index 502c155..fc6de7e 100644 --- a/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt @@ -9,11 +9,13 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertAll +import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.extension.ExtendWith import universe.sparkle.domain.JwtConfigContract import universe.sparkle.domain.SnsType import universe.sparkle.domain.model.User import universe.sparkle.usecase.user.BeIssuedAuthTokenUseCase +import universe.sparkle.usecase.user.ValidateTokenUseCase @ExtendWith(MockKExtension::class) class AuthTokenUseCaseTest { @@ -24,12 +26,13 @@ class AuthTokenUseCaseTest { @InjectMockKs private lateinit var beIssuedAuthTokenUseCase: BeIssuedAuthTokenUseCase + @InjectMockKs + private lateinit var validateTokenUseCase: ValidateTokenUseCase + @BeforeEach fun setUp() { - MockKAnnotations.init(this, relaxed = true, relaxUnitFun = true) - every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } - every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } - every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + MockKAnnotations.init(this.beIssuedAuthTokenUseCase, relaxed = true, relaxUnitFun = true) + MockKAnnotations.init(this.validateTokenUseCase, relaxed = true, relaxUnitFun = true) } @Test @@ -40,6 +43,9 @@ class AuthTokenUseCaseTest { snsType = SnsType.APPLE, snsAuthCode = "test", ) + every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } // when val authToken = beIssuedAuthTokenUseCase(user) // then @@ -49,4 +55,27 @@ class AuthTokenUseCaseTest { { assertThat(authToken.coupleId).isNull() }, ) } + + @Test + fun 만료되지_않은_유저의_토큰이_주어진_경우_검증을_통과한다() { + // given + val user = User( + id = 1, + snsType = SnsType.APPLE, + snsAuthCode = "test", + ) + every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + // when + val authToken = beIssuedAuthTokenUseCase(user) + // then + assertDoesNotThrow { + validateTokenUseCase(authToken.accessToken) + } + } + + // TODO 토큰이 만료된 경우 테스트 작성 + + // TODO 토큰이 변조된 경우 테스트 작성 } From 57c5bcdca9f10c475b734f10712540d07f3ad3a7 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:47:11 +0900 Subject: [PATCH 45/57] feat: Add AuthenticationToken --- .../universe/sparkle/domain/model/AuthenticationToken.kt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt new file mode 100644 index 0000000..4d9d072 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt @@ -0,0 +1,5 @@ +package universe.sparkle.domain.model + +data class AuthenticationToken( + val id: Long +) From d7db66d83a40f5f57d2e79beb1d811a120e51f50 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 06:48:31 +0900 Subject: [PATCH 46/57] chore: Fix file name --- .../usecase/user/{LoadUserUserCase.kt => LoadUserUseCase.kt} | 2 +- ...{BeIssuedAuthTokenUseCaseTest.kt => AuthTokenUseCaseTest.kt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename module-usecase/src/main/kotlin/universe/sparkle/usecase/user/{LoadUserUserCase.kt => LoadUserUseCase.kt} (78%) rename module-usecase/src/test/kotlin/universe/sparkle/usecase/{BeIssuedAuthTokenUseCaseTest.kt => AuthTokenUseCaseTest.kt} (100%) diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUseCase.kt similarity index 78% rename from module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt rename to module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUseCase.kt index d43e9fa..9fd2ebd 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUserCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/LoadUserUseCase.kt @@ -1,6 +1,6 @@ package universe.sparkle.usecase.user -class LoadUserUserCase { +class LoadUserUseCase { operator fun invoke(userId: String) { } } diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt similarity index 100% rename from module-usecase/src/test/kotlin/universe/sparkle/usecase/BeIssuedAuthTokenUseCaseTest.kt rename to module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt From 7537d34fa5797c7890d956f7903e158669bbf277 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 15:40:47 +0900 Subject: [PATCH 47/57] test: Add Unauthorized Case Test --- .../sparkle/usecase/AuthTokenUseCaseTest.kt | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt index fc6de7e..3f29543 100644 --- a/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt @@ -6,6 +6,7 @@ import io.mockk.impl.annotations.InjectMockKs import io.mockk.impl.annotations.MockK import io.mockk.junit5.MockKExtension import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertAll @@ -13,6 +14,7 @@ import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.extension.ExtendWith import universe.sparkle.domain.JwtConfigContract import universe.sparkle.domain.SnsType +import universe.sparkle.domain.exception.Unauthorized import universe.sparkle.domain.model.User import universe.sparkle.usecase.user.BeIssuedAuthTokenUseCase import universe.sparkle.usecase.user.ValidateTokenUseCase @@ -75,7 +77,43 @@ class AuthTokenUseCaseTest { } } - // TODO 토큰이 만료된 경우 테스트 작성 + @Test + fun 만료된_유저의_토큰이_주어진_경우_토큰_만료_에러가_발생한다() { + // given + val user = User( + id = 1, + snsType = SnsType.APPLE, + snsAuthCode = "test", + ) + every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { -1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + // when + val authToken = beIssuedAuthTokenUseCase(user) + // then + assertThatThrownBy { validateTokenUseCase(authToken.accessToken) } + .isInstanceOf(Unauthorized.ExpiredToken::class.java) + .hasMessage("토큰이 만료 되었습니다.") + } - // TODO 토큰이 변조된 경우 테스트 작성 + @Test + fun 유저의_토큰이_변조된_경우_토큰_변조_에러가_발생한다() { + // given + val user = User( + id = 1, + snsType = SnsType.APPLE, + snsAuthCode = "test", + ) + every { jwtConfig.getSecret() } answers { + "secretSecretSecretSecretSecretSecretSecretSecretSecret" + } andThenAnswer { "wiredSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + // when + val authToken = beIssuedAuthTokenUseCase(user) + // then + assertThatThrownBy { validateTokenUseCase(authToken.accessToken) } + .isInstanceOf(Unauthorized.UnsupportedToken::class.java) + .hasMessage("지원하지 않는 방식의 토큰 혹은 변조된 토큰을 사용한 경우입니다.") + } } From 4c60c7863f885fd6a7e15bdcaaa77c11f533fe75 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 17:07:51 +0900 Subject: [PATCH 48/57] feat: move magic string to companion object --- .../sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt index 8d2bd7d..037b0fc 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/BeIssuedAuthTokenInputBoundary.kt @@ -6,4 +6,9 @@ import universe.sparkle.domain.model.User interface BeIssuedAuthTokenInputBoundary { operator fun invoke(user: User): AuthToken operator fun invoke(user: User, accessExpiryPeriodDay: Long, refreshExpiryPeriodDay: Long): AuthToken + + companion object { + const val ACCESS_TOKEN_SUBJECT = "AccessToken" + const val CLAIMS_USER_ID = "userId" + } } From 562395c89fb191aee230720f8289bd4a83878bba Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 17:08:23 +0900 Subject: [PATCH 49/57] feat: change magic string to const --- .../universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt index 1097ef0..d90f7be 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt @@ -54,9 +54,9 @@ class BeIssuedAuthTokenUseCase @Autowired constructor( } private fun createAccessTokenClaims(user: User) = Jwts.claims() - .setSubject("AccessToken") + .setSubject(BeIssuedAuthTokenInputBoundary.ACCESS_TOKEN_SUBJECT) .also { - it["userId"] = user.id + it[BeIssuedAuthTokenInputBoundary.CLAIMS_USER_ID] = user.id } private fun createExpiration(expiryPeriod: Long): Instant = LocalDateTime.now() From 08b30ddb0114801078a487b7c7832afb7497bfad Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 17:08:50 +0900 Subject: [PATCH 50/57] feat: Change Validate Use Case to Extract Token Use Case --- .../usecase/ExtractTokenInputBoundary.kt | 7 ++++ .../usecase/ValidateTokenInputBoundary.kt | 5 --- ...TokenUseCase.kt => ExtractTokenUseCase.kt} | 16 +++++++--- .../sparkle/usecase/AuthTokenUseCaseTest.kt | 32 +++++++++++++++---- 4 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt delete mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt rename module-usecase/src/main/kotlin/universe/sparkle/usecase/user/{ValidateTokenUseCase.kt => ExtractTokenUseCase.kt} (74%) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt new file mode 100644 index 0000000..1a6e1d7 --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt @@ -0,0 +1,7 @@ +package universe.sparkle.domain.usecase + +import universe.sparkle.domain.model.AuthenticationToken + +interface ExtractTokenInputBoundary { + operator fun invoke(token: String): AuthenticationToken +} diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt deleted file mode 100644 index b5507ba..0000000 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ValidateTokenInputBoundary.kt +++ /dev/null @@ -1,5 +0,0 @@ -package universe.sparkle.domain.usecase - -interface ValidateTokenInputBoundary { - operator fun invoke(token: String) -} diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt similarity index 74% rename from module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt rename to module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt index ca6f134..db4156c 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ValidateTokenUseCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt @@ -11,16 +11,22 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service import universe.sparkle.domain.JwtConfigContract import universe.sparkle.domain.exception.Unauthorized -import universe.sparkle.domain.usecase.ValidateTokenInputBoundary +import universe.sparkle.domain.model.AuthenticationToken +import universe.sparkle.domain.usecase.BeIssuedAuthTokenInputBoundary +import universe.sparkle.domain.usecase.ExtractTokenInputBoundary import java.time.LocalDateTime @Service -class ValidateTokenUseCase @Autowired constructor( +class ExtractTokenUseCase @Autowired constructor( private val jwtConfig: JwtConfigContract, -) : ValidateTokenInputBoundary { +) : ExtractTokenInputBoundary { - override fun invoke(token: String) { - if (isExpired(token)) throw Unauthorized.ExpiredToken() + override fun invoke(token: String): AuthenticationToken { + val claims = getClaimsFromToken(token) + val userId = claims[BeIssuedAuthTokenInputBoundary.CLAIMS_USER_ID]?.toString()?.toLong() + return AuthenticationToken( + id = userId ?: throw Unauthorized.UnsupportedToken(), + ) } private fun getClaimsFromToken(token: String): Claims { diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt index 3f29543..914f2cb 100644 --- a/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt @@ -17,7 +17,7 @@ import universe.sparkle.domain.SnsType import universe.sparkle.domain.exception.Unauthorized import universe.sparkle.domain.model.User import universe.sparkle.usecase.user.BeIssuedAuthTokenUseCase -import universe.sparkle.usecase.user.ValidateTokenUseCase +import universe.sparkle.usecase.user.ExtractTokenUseCase @ExtendWith(MockKExtension::class) class AuthTokenUseCaseTest { @@ -29,12 +29,12 @@ class AuthTokenUseCaseTest { private lateinit var beIssuedAuthTokenUseCase: BeIssuedAuthTokenUseCase @InjectMockKs - private lateinit var validateTokenUseCase: ValidateTokenUseCase + private lateinit var extractTokenUseCase: ExtractTokenUseCase @BeforeEach fun setUp() { MockKAnnotations.init(this.beIssuedAuthTokenUseCase, relaxed = true, relaxUnitFun = true) - MockKAnnotations.init(this.validateTokenUseCase, relaxed = true, relaxUnitFun = true) + MockKAnnotations.init(this.extractTokenUseCase, relaxed = true, relaxUnitFun = true) } @Test @@ -62,7 +62,7 @@ class AuthTokenUseCaseTest { fun 만료되지_않은_유저의_토큰이_주어진_경우_검증을_통과한다() { // given val user = User( - id = 1, + id = 1L, snsType = SnsType.APPLE, snsAuthCode = "test", ) @@ -73,7 +73,7 @@ class AuthTokenUseCaseTest { val authToken = beIssuedAuthTokenUseCase(user) // then assertDoesNotThrow { - validateTokenUseCase(authToken.accessToken) + extractTokenUseCase(authToken.accessToken) } } @@ -91,7 +91,7 @@ class AuthTokenUseCaseTest { // when val authToken = beIssuedAuthTokenUseCase(user) // then - assertThatThrownBy { validateTokenUseCase(authToken.accessToken) } + assertThatThrownBy { extractTokenUseCase(authToken.accessToken) } .isInstanceOf(Unauthorized.ExpiredToken::class.java) .hasMessage("토큰이 만료 되었습니다.") } @@ -112,7 +112,25 @@ class AuthTokenUseCaseTest { // when val authToken = beIssuedAuthTokenUseCase(user) // then - assertThatThrownBy { validateTokenUseCase(authToken.accessToken) } + assertThatThrownBy { extractTokenUseCase(authToken.accessToken) } + .isInstanceOf(Unauthorized.UnsupportedToken::class.java) + .hasMessage("지원하지 않는 방식의 토큰 혹은 변조된 토큰을 사용한 경우입니다.") + } + + @Test + fun 토큰에_유저_아이디가_없다면_에러가_발생한다() { + // given + val user = User( + snsType = SnsType.GOOGLE, + snsAuthCode = "test", + ) + every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } + every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } + every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + // when + val authToken = beIssuedAuthTokenUseCase(user) + // then + assertThatThrownBy { extractTokenUseCase(authToken.accessToken) } .isInstanceOf(Unauthorized.UnsupportedToken::class.java) .hasMessage("지원하지 않는 방식의 토큰 혹은 변조된 토큰을 사용한 경우입니다.") } From c98922503d1e8a91402a9f41c26c59cff3678afe Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Wed, 20 Sep 2023 18:18:14 +0900 Subject: [PATCH 51/57] feat: Fix Extract token throw method --- .../sparkle/usecase/user/ExtractTokenUseCase.kt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt index db4156c..20a5d77 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt @@ -1,11 +1,8 @@ package universe.sparkle.usecase.user import io.jsonwebtoken.Claims -import io.jsonwebtoken.ExpiredJwtException +import io.jsonwebtoken.JwtException import io.jsonwebtoken.Jwts -import io.jsonwebtoken.MalformedJwtException -import io.jsonwebtoken.UnsupportedJwtException -import io.jsonwebtoken.security.SignatureException import jakarta.xml.bind.DatatypeConverter import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -37,15 +34,9 @@ class ExtractTokenUseCase @Autowired constructor( .parseClaimsJws(token) .body }.getOrElse { - when (it) { - is ExpiredJwtException -> throw Unauthorized.ExpiredToken() - is MalformedJwtException, - is UnsupportedJwtException, - is SignatureException, - -> throw Unauthorized.UnsupportedToken() - - else -> throw IllegalStateException("Problem occurred during JWT processing") - } + if (it !is JwtException) throw IllegalStateException("Problem occurred during JWT processing") + if (isExpired(token)) throw Unauthorized.ExpiredToken() + throw throw Unauthorized.UnsupportedToken() } } From 59a84f357195ade804c589238cf5645a763635c9 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Thu, 21 Sep 2023 05:34:55 +0900 Subject: [PATCH 52/57] feat: Add Jwt Authentication with Security --- .../domain/gateway/UserDetailGateway.kt | 7 +++ .../domain/model/AuthenticationToken.kt | 4 +- .../universe/sparkle/domain/model/User.kt | 8 +++ .../usecase/ExtractTokenInputBoundary.kt | 1 + .../config/EnvironmentManager.kt | 13 +++++ .../infrastructure/config/SecurityConfig.kt | 34 ++++++++++-- .../controller/response/ErrorResponseDto.kt | 29 ++++++++++ .../filter/JwtAuthenticationFilter.kt | 55 +++++++++++++++++++ .../filter/JwtExceptionFilter.kt | 51 +++++++++++++++++ .../infrastructure/security/UserDetail.kt | 25 +++++---- .../security/UserDetailAdapter.kt | 34 ++++++++++++ .../security/UserDetailMapper.kt | 9 +++ .../usecase/user/BeIssuedAuthTokenUseCase.kt | 2 +- .../usecase/user/ExtractTokenUseCase.kt | 41 ++++++++++---- .../sparkle/usecase/AuthTokenUseCaseTest.kt | 33 +++++++++-- 15 files changed, 310 insertions(+), 36 deletions(-) create mode 100644 module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserDetailGateway.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/EnvironmentManager.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/controller/response/ErrorResponseDto.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtAuthenticationFilter.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtExceptionFilter.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailAdapter.kt create mode 100644 module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailMapper.kt diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserDetailGateway.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserDetailGateway.kt new file mode 100644 index 0000000..2a3147f --- /dev/null +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/gateway/UserDetailGateway.kt @@ -0,0 +1,7 @@ +package universe.sparkle.domain.gateway + +import universe.sparkle.domain.model.AuthenticationToken + +interface UserDetailGateway { + fun loadUserById(userId: String?): AuthenticationToken +} diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt index 4d9d072..3cbf430 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt @@ -1,5 +1,7 @@ package universe.sparkle.domain.model data class AuthenticationToken( - val id: Long + val id: Long, + val nickname: String?, + val image: String?, ) diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt index 7068abb..2c2998d 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt @@ -31,3 +31,11 @@ data class User( require(value?.let { it.length > 10 } ?: true) } } + +fun User.toAuthenticationToken() = this.id?.let { userId -> + AuthenticationToken( + id = userId, + nickname = this.nickname, + image = this.image, + ) +} diff --git a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt index 1a6e1d7..f90d848 100644 --- a/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt +++ b/module-domain/src/main/kotlin/universe/sparkle/domain/usecase/ExtractTokenInputBoundary.kt @@ -4,4 +4,5 @@ import universe.sparkle.domain.model.AuthenticationToken interface ExtractTokenInputBoundary { operator fun invoke(token: String): AuthenticationToken + fun getExpiredUserAuthenticationToken(token: String): AuthenticationToken } diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/EnvironmentManager.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/EnvironmentManager.kt new file mode 100644 index 0000000..370f1af --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/EnvironmentManager.kt @@ -0,0 +1,13 @@ +package universe.sparkle.infrastructure.config + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.core.env.Environment +import org.springframework.stereotype.Component + +@Component +class EnvironmentManager @Autowired constructor( + private val environment: Environment, +) { + + val isDevelopment = environment.activeProfiles.contains("dev") +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt index a5ed3cd..8581efd 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/SecurityConfig.kt @@ -7,21 +7,45 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.http.SessionCreationPolicy import org.springframework.security.web.SecurityFilterChain +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter +import org.springframework.web.cors.CorsConfiguration +import org.springframework.web.cors.UrlBasedCorsConfigurationSource +import universe.sparkle.infrastructure.filter.JwtAuthenticationFilter +import universe.sparkle.infrastructure.filter.JwtExceptionFilter @Configuration @EnableWebSecurity -class SecurityConfig @Autowired constructor() { +class SecurityConfig @Autowired constructor( + private val jwtAuthenticationFilter: JwtAuthenticationFilter, + private val jwtExceptionFilter: JwtExceptionFilter, +) { @Bean @Throws(Exception::class) fun filterChain(http: HttpSecurity): SecurityFilterChain { - return http.cors { it.disable() } - .csrf { it.disable() } - .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) } + return http.csrf { it.disable() } .formLogin { it.disable() } + .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) } + .cors { it.configurationSource(corsConfigurationSource()) } .authorizeHttpRequests { it.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/auth/*", "/status/uni/*").permitAll() it.requestMatchers("/api").authenticated() - }.build() + }.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter::class.java) + .addFilterBefore(jwtExceptionFilter, JwtAuthenticationFilter::class.java) + .build() + } + + @Bean + fun corsConfigurationSource(): UrlBasedCorsConfigurationSource { + val configuration = CorsConfiguration().apply { + addAllowedOrigin("http://uni-sparkle.kro.kr") + addAllowedOrigin("http://localhost:8080") + addAllowedHeader("*") + addAllowedMethod("*") + allowCredentials = true + } + return UrlBasedCorsConfigurationSource().also { + it.registerCorsConfiguration("/**", configuration) + } } } diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/controller/response/ErrorResponseDto.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/controller/response/ErrorResponseDto.kt new file mode 100644 index 0000000..5b69aba --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/controller/response/ErrorResponseDto.kt @@ -0,0 +1,29 @@ +package universe.sparkle.infrastructure.controller.response + +import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.media.Schema +import org.springframework.http.HttpStatus +import universe.sparkle.domain.exception.BusinessException + +@Schema(description = "Error Response DTO") +data class ErrorResponseDto( + @JsonProperty("code") val errorCode: String, + @JsonProperty("message") val message: String, +) + +fun BusinessException.toErrorResponseDto(isDevelopment: Boolean = false) = ErrorResponseDto( + errorCode = "UE${this.code}", + message = if (isDevelopment) this.message else this.javaClass.name, +) + +fun BusinessException.toHttpStatus() = when (this.code) { + 500 -> HttpStatus.INTERNAL_SERVER_ERROR + 503 -> HttpStatus.SERVICE_UNAVAILABLE + in 1000 until 2000 -> HttpStatus.BAD_REQUEST + in 2000 until 3000 -> HttpStatus.UNAUTHORIZED + in 5000 until 6000 -> HttpStatus.NOT_FOUND + in 7000 until 8000 -> HttpStatus.NOT_ACCEPTABLE + in 10000 until 11000 -> HttpStatus.CONFLICT + in 16000 until 17000 -> HttpStatus.UNSUPPORTED_MEDIA_TYPE + else -> throw IllegalArgumentException("unsupported error code") +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtAuthenticationFilter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtAuthenticationFilter.kt new file mode 100644 index 0000000..34e77e6 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtAuthenticationFilter.kt @@ -0,0 +1,55 @@ +package universe.sparkle.infrastructure.filter + +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +import org.springframework.security.core.context.SecurityContextHolder +import org.springframework.security.core.userdetails.UserDetails +import org.springframework.stereotype.Component +import org.springframework.web.filter.OncePerRequestFilter +import universe.sparkle.domain.exception.BadRequest +import universe.sparkle.domain.exception.Unauthorized +import universe.sparkle.domain.usecase.ExtractTokenInputBoundary +import universe.sparkle.infrastructure.security.UserDetail + +@Component +class JwtAuthenticationFilter @Autowired constructor( + private val extractTokenUseCase: ExtractTokenInputBoundary, +) : OncePerRequestFilter() { + + override fun doFilterInternal( + request: HttpServletRequest, + response: HttpServletResponse, + filterChain: FilterChain, + ) { + val uri = request.requestURI + if (isStartApiPath(uri)) { + val token = getJwtFromRequest(request) + setSecurityContextHolder(token) + } + filterChain.doFilter(request, response) + } + + private fun isStartApiPath(uri: String) = uri.startsWith("/api") + + private fun getJwtFromRequest(request: HttpServletRequest): String { + val tokenType = "Bearer " + return runCatching { + request.getHeader("Authentication").substring(tokenType.length) + }.getOrNull() ?: throw Unauthorized.TokenNotExistent() + } + + private fun setSecurityContextHolder(token: String) { + val userDetail: UserDetails = UserDetail.of(extractTokenUseCase(token)) + ?: throw BadRequest.UserNotExistent() + UsernamePasswordAuthenticationToken( + userDetail, + userDetail.password, + userDetail.authorities, + ).also { usernamePasswordAuthenticationToken -> + SecurityContextHolder.getContext().authentication = usernamePasswordAuthenticationToken + } + } +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtExceptionFilter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtExceptionFilter.kt new file mode 100644 index 0000000..7a52733 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/filter/JwtExceptionFilter.kt @@ -0,0 +1,51 @@ +package universe.sparkle.infrastructure.filter + +import com.fasterxml.jackson.databind.ObjectMapper +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.http.MediaType +import org.springframework.stereotype.Component +import org.springframework.web.filter.OncePerRequestFilter +import universe.sparkle.domain.exception.BadRequest +import universe.sparkle.domain.exception.BusinessException +import universe.sparkle.domain.exception.Unauthorized +import universe.sparkle.infrastructure.config.EnvironmentManager +import universe.sparkle.infrastructure.controller.response.toErrorResponseDto +import universe.sparkle.infrastructure.controller.response.toHttpStatus + +@Component +class JwtExceptionFilter @Autowired constructor( + private val environmentManager: EnvironmentManager, +) : OncePerRequestFilter() { + + override fun doFilterInternal( + request: HttpServletRequest, + response: HttpServletResponse, + filterChain: FilterChain, + ) { + runCatching { + filterChain.doFilter(request, response) + }.getOrElse { + when (it) { + is BadRequest -> setErrorResponse(response, it) + is Unauthorized -> setErrorResponse(response, it) + else -> throw it + } + } + } + + private fun setErrorResponse( + response: HttpServletResponse, + exception: BusinessException, + ) { + val errorResponse = exception.toErrorResponseDto(environmentManager.isDevelopment) + with(response) { + characterEncoding = "UTF-8" + contentType = MediaType.APPLICATION_JSON_VALUE + status = exception.toHttpStatus().value() + writer.write(ObjectMapper().writeValueAsString(errorResponse)) + } + } +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt index fc40bd8..831fb32 100644 --- a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetail.kt @@ -3,23 +3,23 @@ package universe.sparkle.infrastructure.security import org.springframework.security.core.GrantedAuthority import org.springframework.security.core.authority.SimpleGrantedAuthority import org.springframework.security.core.userdetails.UserDetails -import universe.sparkle.domain.model.User +import universe.sparkle.domain.model.AuthenticationToken import java.util.stream.Collectors -class UserDetail private constructor( +class UserDetail constructor( val id: Long, private val nickname: String?, - private val snsAuthCode: String, - private val authorities: List = listOf(SimpleGrantedAuthority("User")), val image: String?, + private val authorities: List = listOf(SimpleGrantedAuthority("User")), ) : UserDetails { + override fun getAuthorities(): MutableCollection { return authorities.stream().collect( Collectors.toSet(), ) } - override fun getPassword(): String = snsAuthCode + override fun getPassword(): String? = null override fun getUsername(): String? = nickname @@ -32,13 +32,14 @@ class UserDetail private constructor( override fun isEnabled(): Boolean = true companion object { - fun of(user: User): UserDetail { - return UserDetail( - id = 0, - nickname = user.nickname, - snsAuthCode = user.snsAuthCode, - image = user.image, - ) + fun of(user: AuthenticationToken): UserDetail? { + return user.id?.let { userId -> + UserDetail( + id = userId, + nickname = user.nickname, + image = user.image, + ) + } } } } diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailAdapter.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailAdapter.kt new file mode 100644 index 0000000..e7abfba --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailAdapter.kt @@ -0,0 +1,34 @@ +package universe.sparkle.infrastructure.security + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.data.repository.findByIdOrNull +import org.springframework.security.core.userdetails.UserDetails +import org.springframework.security.core.userdetails.UserDetailsService +import org.springframework.stereotype.Repository +import universe.sparkle.domain.exception.BadRequest +import universe.sparkle.domain.exception.Unauthorized +import universe.sparkle.domain.gateway.UserDetailGateway +import universe.sparkle.domain.model.AuthenticationToken +import universe.sparkle.domain.model.toAuthenticationToken +import universe.sparkle.infrastructure.persistence.mapper.toDomain +import universe.sparkle.infrastructure.persistence.repository.UserJpaRepository + +@Repository +class UserDetailAdapter @Autowired constructor( + private val userJpaRepository: UserJpaRepository, +) : UserDetailGateway, UserDetailsService { + + override fun loadUserByUsername(username: String?): UserDetails { + val userId = username?.toLong() ?: throw Unauthorized.UnsupportedToken() + val user = userJpaRepository.findByIdOrNull(userId)?.toDomain() + ?: throw BadRequest.UserNotExistent() + val userAuthenticationToken = user.toAuthenticationToken() ?: throw BadRequest.UserNotExistent() + return UserDetail.of(userAuthenticationToken) ?: throw BadRequest.UserNotExistent() + } + + override fun loadUserById(userId: String?): AuthenticationToken { + return (this.loadUserByUsername(userId) as? UserDetail) + ?.toAuthenticationToken() + ?: throw IllegalArgumentException("can not change userDetail interface to UserDetailModel") + } +} diff --git a/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailMapper.kt b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailMapper.kt new file mode 100644 index 0000000..18893b5 --- /dev/null +++ b/module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/security/UserDetailMapper.kt @@ -0,0 +1,9 @@ +package universe.sparkle.infrastructure.security + +import universe.sparkle.domain.model.AuthenticationToken + +fun UserDetail.toAuthenticationToken() = AuthenticationToken( + id = this.id, + nickname = this.username, + image = this.image, +) diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt index d90f7be..7898047 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/BeIssuedAuthTokenUseCase.kt @@ -15,7 +15,7 @@ import java.util.Date import javax.crypto.spec.SecretKeySpec @Service -class BeIssuedAuthTokenUseCase @Autowired constructor( +internal class BeIssuedAuthTokenUseCase @Autowired constructor( private val jwtConfig: JwtConfigContract, ) : BeIssuedAuthTokenInputBoundary { diff --git a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt index 20a5d77..c7901a0 100644 --- a/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt +++ b/module-usecase/src/main/kotlin/universe/sparkle/usecase/user/ExtractTokenUseCase.kt @@ -1,29 +1,41 @@ package universe.sparkle.usecase.user import io.jsonwebtoken.Claims -import io.jsonwebtoken.JwtException +import io.jsonwebtoken.ExpiredJwtException import io.jsonwebtoken.Jwts +import io.jsonwebtoken.MalformedJwtException +import io.jsonwebtoken.UnsupportedJwtException +import io.jsonwebtoken.security.SignatureException import jakarta.xml.bind.DatatypeConverter import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service import universe.sparkle.domain.JwtConfigContract import universe.sparkle.domain.exception.Unauthorized +import universe.sparkle.domain.gateway.UserDetailGateway import universe.sparkle.domain.model.AuthenticationToken import universe.sparkle.domain.usecase.BeIssuedAuthTokenInputBoundary import universe.sparkle.domain.usecase.ExtractTokenInputBoundary import java.time.LocalDateTime @Service -class ExtractTokenUseCase @Autowired constructor( +internal class ExtractTokenUseCase @Autowired constructor( private val jwtConfig: JwtConfigContract, + private val userDetailGateway: UserDetailGateway, ) : ExtractTokenInputBoundary { override fun invoke(token: String): AuthenticationToken { + val claims = getClaimsFromToken(token).also { validateExpired(it) } + return getUserIdAt(claims) + } + + override fun getExpiredUserAuthenticationToken(token: String): AuthenticationToken { val claims = getClaimsFromToken(token) - val userId = claims[BeIssuedAuthTokenInputBoundary.CLAIMS_USER_ID]?.toString()?.toLong() - return AuthenticationToken( - id = userId ?: throw Unauthorized.UnsupportedToken(), - ) + return getUserIdAt(claims) + } + + private fun getUserIdAt(claims: Claims): AuthenticationToken { + val userId = claims[BeIssuedAuthTokenInputBoundary.CLAIMS_USER_ID]?.toString() + return userDetailGateway.loadUserById(userId) } private fun getClaimsFromToken(token: String): Claims { @@ -34,16 +46,21 @@ class ExtractTokenUseCase @Autowired constructor( .parseClaimsJws(token) .body }.getOrElse { - if (it !is JwtException) throw IllegalStateException("Problem occurred during JWT processing") - if (isExpired(token)) throw Unauthorized.ExpiredToken() - throw throw Unauthorized.UnsupportedToken() + when (it) { + is MalformedJwtException, + is UnsupportedJwtException, + is SignatureException, + -> throw Unauthorized.UnsupportedToken() + + is ExpiredJwtException -> it.claims + else -> throw IllegalStateException("Problem occurred during JWT processing") + } } } - private fun isExpired(token: String): Boolean { - val claims = getClaimsFromToken(token) + private fun validateExpired(claims: Claims) { val nowDateTime = LocalDateTime.now(JwtConfigContract.zoneIdKST) val tokenExpiredDate = claims.expiration.toInstant().atZone(JwtConfigContract.zoneIdKST).toLocalDateTime() - return tokenExpiredDate.isBefore(nowDateTime) + if (tokenExpiredDate.isBefore(nowDateTime)) throw Unauthorized.ExpiredToken() } } diff --git a/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt index 914f2cb..2b77af0 100644 --- a/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt +++ b/module-usecase/src/test/kotlin/universe/sparkle/usecase/AuthTokenUseCaseTest.kt @@ -10,11 +10,12 @@ import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertAll -import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.extension.ExtendWith import universe.sparkle.domain.JwtConfigContract import universe.sparkle.domain.SnsType import universe.sparkle.domain.exception.Unauthorized +import universe.sparkle.domain.gateway.UserDetailGateway +import universe.sparkle.domain.model.AuthenticationToken import universe.sparkle.domain.model.User import universe.sparkle.usecase.user.BeIssuedAuthTokenUseCase import universe.sparkle.usecase.user.ExtractTokenUseCase @@ -25,6 +26,9 @@ class AuthTokenUseCaseTest { @MockK private lateinit var jwtConfig: JwtConfigContract + @MockK + private lateinit var userDetailGateway: UserDetailGateway + @InjectMockKs private lateinit var beIssuedAuthTokenUseCase: BeIssuedAuthTokenUseCase @@ -59,7 +63,7 @@ class AuthTokenUseCaseTest { } @Test - fun 만료되지_않은_유저의_토큰이_주어진_경우_검증을_통과한다() { + fun 만료되지_않은_유저의_토큰이_주어진_경우_AuthenticationToken을_통해_userId를_얻을_수_있다() { // given val user = User( id = 1L, @@ -69,12 +73,22 @@ class AuthTokenUseCaseTest { every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + every { userDetailGateway.loadUserById("1") } answers { + AuthenticationToken(id = 1L, nickname = null, image = null) + } // when val authToken = beIssuedAuthTokenUseCase(user) // then - assertDoesNotThrow { - extractTokenUseCase(authToken.accessToken) - } + assertAll( + { + assertThat(extractTokenUseCase(authToken.accessToken)) + .isInstanceOf(AuthenticationToken::class.java) + }, + { + assertThat(extractTokenUseCase(authToken.accessToken).id) + .isEqualTo(1L) + }, + ) } @Test @@ -88,6 +102,9 @@ class AuthTokenUseCaseTest { every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } every { jwtConfig.getAccessExpiryPeriodDay() } answers { -1L } every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + every { userDetailGateway.loadUserById("1") } answers { + AuthenticationToken(id = 1L, nickname = null, image = null) + } // when val authToken = beIssuedAuthTokenUseCase(user) // then @@ -109,6 +126,9 @@ class AuthTokenUseCaseTest { } andThenAnswer { "wiredSecretSecretSecretSecretSecretSecretSecretSecret" } every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + every { userDetailGateway.loadUserById("1") } answers { + AuthenticationToken(id = 1L, nickname = null, image = null) + } // when val authToken = beIssuedAuthTokenUseCase(user) // then @@ -127,6 +147,9 @@ class AuthTokenUseCaseTest { every { jwtConfig.getSecret() } answers { "secretSecretSecretSecretSecretSecretSecretSecretSecret" } every { jwtConfig.getAccessExpiryPeriodDay() } answers { 1L } every { jwtConfig.getRefreshExpiryPeriodDay() } answers { 2L } + every { userDetailGateway.loadUserById(null) } answers { + throw Unauthorized.UnsupportedToken() + } // when val authToken = beIssuedAuthTokenUseCase(user) // then From 90cb4e6ba7aa5c60dd8fda088be4ad17a44065fa Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Thu, 21 Sep 2023 05:45:37 +0900 Subject: [PATCH 53/57] chore: Fix CI action --- .github/workflows/gradle_task.yml | 41 +++++++++ .github/workflows/pr_ci_checker.yml | 137 ++++++++++------------------ 2 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 .github/workflows/gradle_task.yml diff --git a/.github/workflows/gradle_task.yml b/.github/workflows/gradle_task.yml new file mode 100644 index 0000000..e6e93a4 --- /dev/null +++ b/.github/workflows/gradle_task.yml @@ -0,0 +1,41 @@ +on: + workflow_call: + inputs: + tasks: + description: gradle execute option + type: string + +jobs: + gradle-task: + strategy: + matrix: + gradle: ${{ fromJSON(inputs.tasks) }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.CI_TOKEN }} + submodules: true + + - name: Gradle cache + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Run Gradle Task + run: ./gradlew ${{matrix.gradle}} diff --git a/.github/workflows/pr_ci_checker.yml b/.github/workflows/pr_ci_checker.yml index 615ef31..7c1af9a 100644 --- a/.github/workflows/pr_ci_checker.yml +++ b/.github/workflows/pr_ci_checker.yml @@ -11,95 +11,54 @@ permissions: pull-requests: write jobs: - ktlint: + ci: + uses: ./.github/workflows/gradle_task.yml + with: + tasks: '["ktlintCheck", "build -x test -x ktlintCheck", "test"]' + secrets: inherit + + publish-test-result: + needs: + - ci runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Publish Test Results + uses: EnricoMi/publish-unit-test-result-action@v1 with: - token: ${{ secrets.CI_TOKEN }} - submodules: true - - - name: Gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: ktlintCheck - run: ./gradlew ktlintCheck - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - token: ${{ secrets.CI_TOKEN }} - submodules: true - - - name: Gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: build - run: ./gradlew build -x test -x ktlintCheck - - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - token: ${{ secrets.CI_TOKEN }} - submodules: true - - - name: Gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: test - run: ./gradlew test + files: build/test-results/**/*.xml + + + result-success: + needs: + - ci + if: success() + runs-on: ubuntu-latest + steps: + - name: On Success!! Congratulations + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_COLOR: '#53A551' + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} + SLACK_TITLE: 'Uni/PR Check S.U.C.C.E.S.S 🎉🎉🎉' + SLACK_ICON: ${{ github.event.org.avatar_url }} + MSG_MINIMAL: event,actions url, commit + SLACK_USERNAME: Uni-server + SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' + + result-failure: + needs: + - ci + if: failure() + runs-on: ubuntu-latest + steps: + - name: On Failed, Notify in Slack + if: ${{ failure() }} + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_COLOR: '#ff0000' + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} + SLACK_TITLE: 'Uni/Server Debug build Fail❌ 에러를 확인해주세요' + SLACK_ICON: ${{ github.event.org.avatar_url }} + MSG_MINIMAL: event,actions url, commit + SLACK_USERNAME: Uni-server + SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' From 590eb3fc98298c2b4129a2785636baa2ff999009 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Thu, 21 Sep 2023 05:47:45 +0900 Subject: [PATCH 54/57] chore: Fix CI action --- .github/workflows/pr_ci_checker.yml | 68 ++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/pr_ci_checker.yml b/.github/workflows/pr_ci_checker.yml index 7c1af9a..7299c98 100644 --- a/.github/workflows/pr_ci_checker.yml +++ b/.github/workflows/pr_ci_checker.yml @@ -28,37 +28,37 @@ jobs: files: build/test-results/**/*.xml - result-success: - needs: - - ci - if: success() - runs-on: ubuntu-latest - steps: - - name: On Success!! Congratulations - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_COLOR: '#53A551' - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} - SLACK_TITLE: 'Uni/PR Check S.U.C.C.E.S.S 🎉🎉🎉' - SLACK_ICON: ${{ github.event.org.avatar_url }} - MSG_MINIMAL: event,actions url, commit - SLACK_USERNAME: Uni-server - SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' - - result-failure: - needs: - - ci - if: failure() - runs-on: ubuntu-latest - steps: - - name: On Failed, Notify in Slack - if: ${{ failure() }} - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_COLOR: '#ff0000' - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} - SLACK_TITLE: 'Uni/Server Debug build Fail❌ 에러를 확인해주세요' - SLACK_ICON: ${{ github.event.org.avatar_url }} - MSG_MINIMAL: event,actions url, commit - SLACK_USERNAME: Uni-server - SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' +# result-success: +# needs: +# - ci +# if: success() +# runs-on: ubuntu-latest +# steps: +# - name: On Success!! Congratulations +# uses: rtCamp/action-slack-notify@v2 +# env: +# SLACK_COLOR: '#53A551' +# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} +# SLACK_TITLE: 'Uni/PR Check S.U.C.C.E.S.S 🎉🎉🎉' +# SLACK_ICON: ${{ github.event.org.avatar_url }} +# MSG_MINIMAL: event,actions url, commit +# SLACK_USERNAME: Uni-server +# SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' +# +# result-failure: +# needs: +# - ci +# if: failure() +# runs-on: ubuntu-latest +# steps: +# - name: On Failed, Notify in Slack +# if: ${{ failure() }} +# uses: rtCamp/action-slack-notify@v2 +# env: +# SLACK_COLOR: '#ff0000' +# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} +# SLACK_TITLE: 'Uni/Server Debug build Fail❌ 에러를 확인해주세요' +# SLACK_ICON: ${{ github.event.org.avatar_url }} +# MSG_MINIMAL: event,actions url, commit +# SLACK_USERNAME: Uni-server +# SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' From 674d6250f8ab44aae330ee4ff50ba58bc42cc867 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Thu, 21 Sep 2023 05:49:45 +0900 Subject: [PATCH 55/57] chore: Fix CI action --- .github/workflows/pr_ci_checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_ci_checker.yml b/.github/workflows/pr_ci_checker.yml index 7299c98..fdaf93a 100644 --- a/.github/workflows/pr_ci_checker.yml +++ b/.github/workflows/pr_ci_checker.yml @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/gradle_task.yml with: tasks: '["ktlintCheck", "build -x test -x ktlintCheck", "test"]' - secrets: inherit + secrets: inherit publish-test-result: needs: From f05489b58e266cd70deb95f2b8f149f2b3e674fd Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Thu, 21 Sep 2023 05:52:05 +0900 Subject: [PATCH 56/57] chore: Fix CI action --- .github/workflows/pr_ci_checker.yml | 68 ++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/pr_ci_checker.yml b/.github/workflows/pr_ci_checker.yml index fdaf93a..ab79df0 100644 --- a/.github/workflows/pr_ci_checker.yml +++ b/.github/workflows/pr_ci_checker.yml @@ -28,37 +28,37 @@ jobs: files: build/test-results/**/*.xml -# result-success: -# needs: -# - ci -# if: success() -# runs-on: ubuntu-latest -# steps: -# - name: On Success!! Congratulations -# uses: rtCamp/action-slack-notify@v2 -# env: -# SLACK_COLOR: '#53A551' -# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} -# SLACK_TITLE: 'Uni/PR Check S.U.C.C.E.S.S 🎉🎉🎉' -# SLACK_ICON: ${{ github.event.org.avatar_url }} -# MSG_MINIMAL: event,actions url, commit -# SLACK_USERNAME: Uni-server -# SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' -# -# result-failure: -# needs: -# - ci -# if: failure() -# runs-on: ubuntu-latest -# steps: -# - name: On Failed, Notify in Slack -# if: ${{ failure() }} -# uses: rtCamp/action-slack-notify@v2 -# env: -# SLACK_COLOR: '#ff0000' -# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} -# SLACK_TITLE: 'Uni/Server Debug build Fail❌ 에러를 확인해주세요' -# SLACK_ICON: ${{ github.event.org.avatar_url }} -# MSG_MINIMAL: event,actions url, commit -# SLACK_USERNAME: Uni-server -# SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' + result-success: + needs: + - ci + if: success() + runs-on: ubuntu-latest + steps: + - name: On Success!! Congratulations + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_COLOR: '#53A551' + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} + SLACK_TITLE: 'Uni/PR Check S.U.C.C.E.S.S 🎉🎉🎉' + SLACK_ICON: ${{ github.event.org.avatar_url }} + MSG_MINIMAL: event,actions url, commit + SLACK_USERNAME: Uni-server + SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' + + result-failure: + needs: + - ci + if: failure() + runs-on: ubuntu-latest + steps: + - name: On Failed, Notify in Slack + if: ${{ failure() }} + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_COLOR: '#ff0000' + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} + SLACK_TITLE: 'Uni/Server Debug build Fail❌ 에러를 확인해주세요' + SLACK_ICON: ${{ github.event.org.avatar_url }} + MSG_MINIMAL: event,actions url, commit + SLACK_USERNAME: Uni-server + SLACK_MESSAGE: '${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.number}}' From 39cf2cc98e10c4b421d834a05f170f205045cb55 Mon Sep 17 00:00:00 2001 From: jinsu4755 Date: Thu, 21 Sep 2023 05:56:01 +0900 Subject: [PATCH 57/57] chore: Fix CI action test files path --- .github/workflows/pr_ci_checker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_ci_checker.yml b/.github/workflows/pr_ci_checker.yml index ab79df0..9359d46 100644 --- a/.github/workflows/pr_ci_checker.yml +++ b/.github/workflows/pr_ci_checker.yml @@ -25,7 +25,10 @@ jobs: - name: Publish Test Results uses: EnricoMi/publish-unit-test-result-action@v1 with: - files: build/test-results/**/*.xml + files: | + module-domain/build/test-results/**/*.xml + module-infrastructure/build/test-results/**/*.xml + module-usecase/build/test-results/**/*.xml result-success: