MOSU-kmc feat: 본인인증 연동 구현(이쿠죠잇!)

.github/workflows/docker-ci.yaml

@@ -2,12 +2,9 @@ name: Docker CI/CD
 
 on:
   pull_request:
-    branches:
-      - 'develop'
+    branches: [ develop ]
   push:
-    branches:
-      - 'develop'
-
+    branches: [ develop ]
   workflow_dispatch:
 
 jobs:
@@ -24,6 +21,12 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
+      - name: Clone external repo with jar into libs/
+        run: |
+          mkdir -p libs
+          git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/mosu-dev/mosu-kmc-jar.git temp-jar
+          cp temp-jar/*.jar libs/
+
       - name: Build with Gradle
         run: ./gradlew clean build -x test
 
@@ -34,9 +37,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build Docker image
-        run: |
-          docker build -t kangtaehyun1107/mosu-server:${{ github.sha }} .
-
+        run: docker build -t kangtaehyun1107/mosu-server:${{ github.sha }} .
+        working-directory:
       - name: Push Docker image
-        run: |
-          docker push kangtaehyun1107/mosu-server:${{ github.sha }}
+        run: docker push kangtaehyun1107/mosu-server:${{ github.sha }}

.gitignore

@@ -39,4 +39,6 @@ out/
 
 docker-compose/.env
 docker-compose/.env.local
-/logs/app.log
+
+/logs/**
+/libs/**

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:21-jdk
-ARG JAR_FILE=build/libs/*.jar
-ADD ${JAR_FILE} app.jar
-ENTRYPOINT ["java", "-Duser.timezone=GMT+9", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.jar"]
+FROM amazoncorretto:21
+COPY build/libs/*SNAPSHOT.war app.war
+
+ENTRYPOINT ["java", "-Duser.timezone=GMT+9", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.war"]

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.4.5'
     id 'io.spring.dependency-management' version '1.1.7'
+    id 'war'
 }
 
 group = 'life.mosu'
@@ -24,22 +25,26 @@ repositories {
 }
 
 dependencies {
-
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     testImplementation 'org.projectlombok:lombok'
     testImplementation 'org.projectlombok:lombok'
     testCompileOnly 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
-//    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+    // 인증사 관련 의존성
+    implementation 'javax.servlet:jstl:1.2'
+    implementation "org.apache.tomcat.embed:tomcat-embed-jasper"
+
     // swagger
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9"
 
     // jwt
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
@@ -58,6 +63,13 @@ dependencies {
     implementation 'org.flywaydb:flyway-mysql'
     runtimeOnly 'com.mysql:mysql-connector-j'
 
+    // Testcontainers
+    testImplementation 'org.springframework.boot:spring-boot-testcontainers:3.3.5'
+    testImplementation 'org.testcontainers:testcontainers:1.19.3'
+    testImplementation 'org.testcontainers:junit-jupiter:1.19.3'
+    testImplementation 'org.testcontainers:mysql:1.20.0'
+
+
     // security
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
@@ -96,6 +108,12 @@ dependencies {
     testImplementation 'org.testcontainers:mysql:1.20.0'
 }
 
+configurations.configureEach {
+    resolutionStrategy {
+        force 'org.apache.commons:commons-lang3:3.18.0'
+    }
+}
+
 tasks.named('test') {
     useJUnitPlatform()
 }

src/main/java/life/mosu/mosuserver/application/auth/AuthService.java

@@ -1,6 +1,6 @@
 package life.mosu.mosuserver.application.auth;
 
-import jakarta.servlet.http.HttpServletRequest;
+import life.mosu.mosuserver.application.auth.provider.AuthTokenManager;
 import life.mosu.mosuserver.domain.profile.ProfileJpaRepository;
 import life.mosu.mosuserver.domain.user.UserJpaEntity;
 import life.mosu.mosuserver.global.exception.CustomRuntimeException;
@@ -44,7 +44,7 @@ public LoginCommandResponse login(final LoginRequest request) {
     }
 
     @Transactional
-    public Token reissueAccessToken(final HttpServletRequest servletRequest) {
-        return authTokenManager.reissueAccessToken(servletRequest);
+    public Token reissueAccessToken(final String refreshTokenHeader) {
+        return authTokenManager.reissueAccessToken(refreshTokenHeader);
     }
 }

src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetails.java

@@ -1,7 +1,6 @@
 package life.mosu.mosuserver.application.auth;
 
 import life.mosu.mosuserver.domain.user.UserJpaEntity;
-import lombok.Getter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -10,7 +9,9 @@
 import java.util.Collection;
 import java.util.List;
 
-public record PrincipalDetails(@Getter UserJpaEntity user) implements UserDetails {
+public record PrincipalDetails(
+        UserJpaEntity user
+) implements UserDetails {
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {

src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetailsService.java

@@ -18,6 +18,7 @@ public class PrincipalDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException {
-        return new PrincipalDetails(userRepository.findByLoginId(username).orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND)));
+        return new PrincipalDetails(userRepository.findByLoginId(username)
+                .orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND)));
     }
 }

src/main/java/life/mosu/mosuserver/application/auth/SignUpService.java

@@ -2,11 +2,11 @@
 
 import life.mosu.mosuserver.application.auth.processor.SignUpAccountStepProcessor;
 import life.mosu.mosuserver.application.auth.processor.SignUpProfileStepProcessor;
+import life.mosu.mosuserver.application.auth.provider.AuthTokenManager;
 import life.mosu.mosuserver.domain.profile.ProfileJpaEntity;
 import life.mosu.mosuserver.domain.user.UserJpaEntity;
 import life.mosu.mosuserver.presentation.auth.dto.SignUpAccountRequest;
 import life.mosu.mosuserver.presentation.auth.dto.SignUpProfileRequest;
-import life.mosu.mosuserver.presentation.auth.dto.SignUpRequest;
 import life.mosu.mosuserver.presentation.auth.dto.Token;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -23,23 +23,20 @@ public class SignUpService {
     private final PasswordEncoder passwordEncoder;
 
     @Transactional
-    public Token signUp(final SignUpRequest request) {
-        //STEP1 - add account into persistence storage
-        UserJpaEntity user = doAccountStep(request.signUpAccountStep());
-
-        //STEP2 - add profile into persistence storage
-        doProfileStep(user.getId(), request.signUpProfileStep());
+    public Token signUp(final SignUpAccountRequest request) {
+        UserJpaEntity user = doAccountStep(request);
 
         return authTokenManager.generateAuthToken(user);
     }
 
+    @Transactional
+    public void registerProfile(final Long userId, final SignUpProfileRequest request) {
+        ProfileJpaEntity profile = request.toEntity(userId);
+        signUpProfileStepProcessor.process(profile);
+    }
+
     private UserJpaEntity doAccountStep(SignUpAccountRequest request) {
         UserJpaEntity user = request.toAuthEntity(passwordEncoder);
         return signUpAccountStepProcessor.process(user);
     }
-
-    private void doProfileStep(Long userId, SignUpProfileRequest request) {
-        ProfileJpaEntity profile = request.toEntity(userId);
-        signUpProfileStepProcessor.process(profile);
-    }
 }

src/main/java/life/mosu/mosuserver/application/auth/kmc/KmcEventTxService.java

@@ -0,0 +1,32 @@
+package life.mosu.mosuserver.application.auth.kmc;
+
+import life.mosu.mosuserver.application.auth.kmc.tx.KmcContext;
+import life.mosu.mosuserver.application.auth.kmc.tx.KmcTxEventFactory;
+import life.mosu.mosuserver.global.tx.TxEvent;
+import life.mosu.mosuserver.global.tx.TxEventPublisher;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class KmcEventTxService {
+    private final TxEventPublisher txEventPublisher;
+    private final KmcTxEventFactory eventFactory;
+
+    @Transactional
+    public void publishIssueEvent(String certNum, Long expiration) {
+        TxEvent<?> event = eventFactory.create(
+                KmcContext.ofSuccess(certNum, expiration)
+        );
+        txEventPublisher.publish(event);
+    }
+
+    @Transactional
+    public void publishFailureEvent(String certNum) {
+        TxEvent<?> event = eventFactory.create(
+                KmcContext.ofFailure(certNum)
+        );
+        txEventPublisher.publish(event);
+    }
+}

src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcContext.java

@@ -0,0 +1,24 @@
+package life.mosu.mosuserver.application.auth.kmc.tx;
+
+import life.mosu.mosuserver.domain.auth.signup.SignUpToken;
+
+public record KmcContext(
+        String certNum,
+        Long expiration,
+        Boolean isSuccess
+) {
+    public static KmcContext ofSuccess(String certNum, Long expiration) {
+        return new KmcContext(certNum, expiration, true);
+    }
+
+    public static KmcContext ofFailure(String certNum) {
+        return new KmcContext(certNum, 0L, false);
+    }
+
+    public SignUpToken toSignUpToken() {
+        return SignUpToken.of(
+            this.certNum,
+            this.expiration
+        );
+    }
+}

src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcIssueTxEvent.java

@@ -0,0 +1,10 @@
+package life.mosu.mosuserver.application.auth.kmc.tx;
+
+import life.mosu.mosuserver.global.tx.TxEvent;
+
+public class KmcIssueTxEvent extends TxEvent<KmcContext> {
+
+    public KmcIssueTxEvent(boolean success, KmcContext context) {
+        super(success, context);
+    }
+}

src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventFactory.java

@@ -0,0 +1,14 @@
+package life.mosu.mosuserver.application.auth.kmc.tx;
+
+import life.mosu.mosuserver.global.tx.TxEvent;
+import life.mosu.mosuserver.global.tx.TxEventFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class KmcTxEventFactory implements TxEventFactory<KmcContext> {
+
+    @Override
+    public TxEvent<?> create(KmcContext context) {
+        return new KmcIssueTxEvent(context.isSuccess(), context);
+    }
+}