Feat #133 코틀린 마이그레이션 (build.gradle -> build.gradle.kts 로 변경, 의존성 버전 변경)

Readme.md

@@ -45,7 +45,6 @@ Modular Monolithic 아키텍처이므로, 다음과 같은 모듈들로 구성
 | Payment-Api      | 주문한 상품에 대한 결제 처리 및 취소를 담당하는 모듈입니다.           |
 | Product-Api      | 상품을 관리하고 사용자에게 노출하는 기능을 담당하는 모듈입니다.          |
 | Point-Api        | (추가예정)                                       |
-| Purchase-Api     | (대체예정)                                       |
 
 각 도메인 모듈은 하위에 아래와 같이 Layered Architecture 형식의 Build Artifacts로 분리되어 구성됩니다.
 

account-api/account-application/build.gradle.kts

@@ -0,0 +1,18 @@
+tasks.jar {
+    enabled = true
+}
+
+tasks.bootJar {
+    enabled = false
+}
+
+plugins {
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+}
+
+dependencies {
+    implementation(project(":account-api:account-domain"))
+    implementation(project(":common"))
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+}

account-api/account-domain/build.gradle.kts

@@ -0,0 +1,16 @@
+tasks.jar {
+    enabled = true
+}
+
+tasks.bootJar {
+    enabled = false
+}
+
+dependencies {
+    implementation(project(":common"))
+    implementation("jakarta.persistence:jakarta.persistence-api:${Version.jakartaPersistenceApi}")
+    implementation("org.hibernate:hibernate-core:${Version.hibernateCore}")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}

account-api/account-infrastructure/build.gradle.kts

@@ -0,0 +1,25 @@
+tasks.jar {
+    enabled = true
+}
+
+tasks.bootJar {
+    enabled = false
+}
+
+plugins {
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+}
+
+dependencies {
+    implementation(project(":account-api:account-domain"))
+    implementation(project(":common"))
+    implementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}")
+    implementation("io.jsonwebtoken:jjwt-impl:${Version.jjwt}")
+    implementation("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+}

account-api/account-infrastructure/src/main/java/kr/flab/movieon/account/infrastructure/jwt/impl/JwtTokenParser.java

@@ -1,15 +1,7 @@
 package kr.flab.movieon.account.infrastructure.jwt.impl;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.Jws;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-import java.util.List;
 import kr.flab.movieon.account.infrastructure.jwt.AlreadyTokenExpiredException;
 import kr.flab.movieon.account.infrastructure.jwt.RawToken;
 import kr.flab.movieon.account.infrastructure.jwt.TokenParser;
@@ -18,6 +10,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.crypto.SecretKey;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 public final class JwtTokenParser implements TokenParser {
 
     private final Logger log = LoggerFactory.getLogger(JwtTokenParser.class);
@@ -31,17 +27,18 @@ public JwtTokenParser(TokenProperties tokenProperties) {
     @Override
     public RawToken parse(String token) {
         try {
-            Jws<Claims> jwt = Jwts.parserBuilder()
-                .setSigningKey(getKey(tokenProperties.getBase64TokenSigningKey()))
-                .build()
-                .parseClaimsJws(token);
+            Jws<Claims> jwt = Jwts.parser()
+                    .verifyWith(getKey(tokenProperties.getBase64TokenSigningKey()))
+                    .build()
+                    .parseSignedClaims(token);
+
             String jti = (String) jwt.getBody().get("jti");
             if (jti == null) {
-                return new RawToken((String) jwt.getBody().get("email"),
-                    (List<String>) jwt.getBody().get("scopes"));
+                return new RawToken((String) jwt.getPayload().get("email"),
+                        (List<String>) jwt.getPayload().get("scopes"));
             }
             return new RawToken((String) jwt.getBody().get("email"), jti,
-                (List<String>) jwt.getBody().get("scopes"));
+                    (List<String>) jwt.getPayload().get("scopes"));
         } catch (UnsupportedJwtException | MalformedJwtException | IllegalArgumentException ex) {
             log.error("Invalid JWT Token", ex);
             throw new InvalidTokenException();
@@ -51,7 +48,7 @@ public RawToken parse(String token) {
         }
     }
 
-    private Key getKey(String signKey) {
+    private SecretKey getKey(String signKey) {
         return Keys.hmacShaKeyFor(signKey.getBytes(StandardCharsets.UTF_8));
     }
 }

account-api/account-presentation/build.gradle.kts

@@ -0,0 +1,23 @@
+tasks.jar {
+    enabled = true
+}
+
+tasks.bootJar {
+    enabled = false
+}
+
+plugins {
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+}
+
+dependencies {
+    implementation(project(":account-api:account-application"))
+    implementation(project(":common"))
+    implementation("org.springdoc:springdoc-openapi-ui:${Version.springdocOpenapi}")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
+    testImplementation("org.springframework.security:spring-security-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+}

app/build.gradle.kts

@@ -0,0 +1,57 @@
+tasks.bootJar {
+    enabled = true
+}
+
+plugins {
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+    kotlin("plugin.jpa")
+}
+
+dependencies {
+    implementation(project(":notification-api:notification-presentation"))
+    implementation(project(":notification-api:notification-application"))
+    implementation(project(":notification-api:notification-domain"))
+    implementation(project(":notification-api:notification-infrastructure"))
+
+    implementation(project(":account-api:account-presentation"))
+    implementation(project(":account-api:account-application"))
+    implementation(project(":account-api:account-domain"))
+    implementation(project(":account-api:account-infrastructure"))
+
+    implementation(project(":order-api:order-presentation"))
+    implementation(project(":order-api:order-application"))
+    implementation(project(":order-api:order-domain"))
+    implementation(project(":order-api:order-infrastructure"))
+
+    implementation(project(":payment-api:payment-presentation"))
+    implementation(project(":payment-api:payment-application"))
+    implementation(project(":payment-api:payment-domain"))
+    implementation(project(":payment-api:payment-infrastructure"))
+
+    implementation(project(":product-api:product-presentation"))
+    implementation(project(":product-api:product-application"))
+    implementation(project(":product-api:product-domain"))
+    implementation(project(":product-api:product-infrastructure"))
+
+    implementation(project(":query-api"))
+    implementation(project(":common"))
+
+    implementation("org.springdoc:springdoc-openapi-ui:${Version.springdocOpenapi}")
+    implementation("org.springdoc:springdoc-openapi-security:${Version.springdocOpenapi}")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-amqp")
+    implementation("it.ozimov:embedded-redis:${Version.embeddedRedis}") {
+        exclude(group = "org.slf4j", module = "slf4j-simple")
+    }
+    runtimeOnly("com.mysql:mysql-connector-j")
+    implementation("org.flywaydb:flyway-mysql")
+    testImplementation("com.h2database:h2")
+    testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:${Version.fixtureMonkey}")
+    // com.navercorp.fixturemonkey - org.glassfish:jakarta.el:3.0.3 보안 이슈로 버전 변경 (CVE-2021-28170)
+    testImplementation("org.glassfish:jakarta.el:3.0.4")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+}