refactor/#181 Auth 인증 인가 모듈 분리

.github/workflows/dev-build-deploy.yml

@@ -49,6 +49,11 @@ jobs:
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aics-admin:${{ github.sha }} -f aics-admin/Dockerfile .
           docker tag ${{ secrets.DOCKERHUB_USERNAME }}/aics-admin:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/aics-admin:latest
 
+      - name: Docker image build for aics-auth
+        run: |
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }} -f aics-auth/Dockerfile .
+          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:latest
+
       # Docker Hub 이미지 푸시
       - name: docker Hub push for aics-api
         run: |
@@ -60,6 +65,11 @@ jobs:
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-admin:${{ github.sha }}
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-admin:latest
 
+      - name: docker Hub push for aics-auth
+        run: |
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:latest
+
   deploy-to-dev:
     runs-on: ubuntu-latest
     needs: build-docker-image
@@ -75,5 +85,7 @@ jobs:
           script: |
             echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull aics-api
             echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull aics-admin
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull aics-auth
             echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-api
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-admin
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-admin
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-auth

.github/workflows/pull-request-test-coverage.yml

@@ -42,6 +42,7 @@ jobs:
             ${{ github.workspace }}/aics-domain/build/jacoco/test/jacocoTestReport.xml
             ${{ github.workspace }}/aics-api/build/jacoco/test/jacocoTestReport.xml
             ${{ github.workspace }}/aics-admin/build/jacoco/test/jacocoTestReport.xml
+            ${{ github.workspace }}/aics-auth/build/jacoco/test/jacocoTestReport.xml
           token: ${{ secrets.GITHUB_TOKEN }}
           min-coverage-overall: 80
           min-coverage-changed-files: 70

aics-admin/src/main/java/kgu/developers/admin/config/SwaggerConfig.java

@@ -1,20 +1,5 @@
 package kgu.developers.admin.config;
 
-import static java.lang.String.format;
-import static org.springframework.security.config.Elements.JWT;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
@@ -23,6 +8,19 @@
 import io.swagger.v3.oas.models.servers.Server;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+import static org.springframework.security.config.Elements.JWT;
 
 @Configuration
 @RequiredArgsConstructor
@@ -39,6 +37,9 @@ public class SwaggerConfig {
 	@Value("${profiles.admin-api-port}")
 	private int adminApiPort;
 
+	@Value("${profiles.auth-api-port}")
+	private int authApiPort;
+
 	private final Map<String, Map<String, Object>> profileServerConfig = new HashMap<>();
 
 	@PostConstruct
@@ -96,19 +97,32 @@ private SecurityScheme securityScheme() {
 	private String getDescription() {
 		String activeProfile = getActiveProfile();
 		return format("""
-                AI 컴퓨터공학부 커뮤니티 관리자, AICS-HOME ADMIN API 입니다.\n\n
-                로그인 API를 통해 액세스 토큰을 발급 받고 헤더에 값을 넣어주세요 . \n\n
-                별다른 절차 없이 API를 사용하실 수 있습니다.\n\n
-
-                사용자 API 문서는 다음 링크에서 확인하실 수 있습니다.\n
-                <ul>
-                    <li>AICS-HOME API : <a href="%s" target="_blank">%s</a></li>
-                </ul>
-                """,
-			getApiSwaggerByProfile(activeProfile), getApiSwaggerByProfile(activeProfile)
+				AI 컴퓨터공학부 커뮤니티 관리자, AICS-HOME ADMIN API 입니다.
+
+				로그인 API를 통해 액세스 토큰을 발급 받고 헤더에 값을 넣어주세요.
+
+				별다른 절차 없이 API를 사용하실 수 있습니다.
+
+				사용자 API 문서는 다음 링크에서 확인하실 수 있습니다.
+				<ul>
+				    <li>AICS-HOME API : <a href="%s" target="_blank">%s</a></li>
+				</ul>
+
+				인증 인가 API 문서는 다음 링크에서 확인하실 수 있습니다.
+				<ul>
+				    <li>AICS-HOME AUTH API : <a href="%s" target="_blank">%s</a></li>
+				</ul>
+				""",
+			getApiSwaggerByProfile(activeProfile), getApiSwaggerByProfile(activeProfile),
+			getAuthSwaggerByProfile(activeProfile), getAuthSwaggerByProfile(activeProfile)
 		);
 	}
 
+	private String getAuthSwaggerByProfile(String profile) {
+		String url = (String) profileServerConfig.get(profile).get("url");
+		return url + ":" + authApiPort + "/swagger-ui/index.html";
+	}
+
 	private String getApiSwaggerByProfile(String profile) {
 		String url = (String) profileServerConfig.get(profile).get("url");
 		return url + ":" + apiPort + "/swagger-ui/index.html";

aics-admin/src/main/resources/application-dev.yml

@@ -11,4 +11,5 @@ spring:
 profiles:
   current-ip: ${CURRENT_IP}
   api-port: ${API_SERVER_PORT:8080}
-  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  auth-api-port: ${AUTH_API_SERVER_PORT:8082}

aics-admin/src/main/resources/application-local.yml

@@ -6,4 +6,5 @@ spring:
 profiles:
   current-ip: ${CURRENT_IP:localhost}
   api-port: ${API_SERVER_PORT:8080}
-  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  auth-api-port: ${AUTH_API_SERVER_PORT:8082}

aics-api/src/main/java/kgu/developers/api/config/SwaggerConfig.java

@@ -1,20 +1,5 @@
 package kgu.developers.api.config;
 
-import static java.lang.String.format;
-import static org.springframework.security.config.Elements.JWT;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
@@ -23,6 +8,19 @@
 import io.swagger.v3.oas.models.servers.Server;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+import static org.springframework.security.config.Elements.JWT;
 
 @Configuration
 @RequiredArgsConstructor
@@ -39,6 +37,9 @@ public class SwaggerConfig {
 	@Value("${profiles.admin-api-port}")
 	private int adminApiPort;
 
+	@Value("${profiles.auth-api-port}")
+	private int authApiPort;
+
 	private final Map<String, Map<String, Object>> profileServerConfig = new HashMap<>();
 
 	@PostConstruct
@@ -96,16 +97,26 @@ private SecurityScheme securityScheme() {
 	private String getDescription() {
 		String activeProfile = getActiveProfile();
 		return format("""
-                AI 컴퓨터공학부 커뮤니티, AICS-HOME API 입니다.\n\n
-                로그인 API를 통해 액세스 토큰을 발급 받고 헤더에 값을 넣어주세요 . \n\n
-                별다른 절차 없이 API를 사용하실 수 있습니다.\n\n
-
-                관리자 API 문서는 다음 링크에서 확인하실 수 있습니다.\n
-                <ul>
-                    <li>AICS-HOME ADMIN API : <a href="%s" target="_blank">%s</a></li>
-                </ul>
-                """,
-			getAdminSwaggerByProfile(activeProfile), getAdminSwaggerByProfile(activeProfile)
+				AI 컴퓨터공학부 커뮤니티 관리자, AICS-HOME ADMIN API 입니다.
+
+				로그인 API를 통해 액세스 토큰을 발급 받고 헤더에 값을 넣어주세요.
+
+				별다른 절차 없이 API를 사용하실 수 있습니다.
+
+				관리자 API 문서는 다음 링크에서 확인하실 수 있습니다.
+				<ul>
+				    <li>AICS-HOME ADMIN API : <a href="%s" target="_blank">%s</a></li>
+				</ul>
+
+				인증 인가 API 문서는 다음 링크에서 확인하실 수 있습니다.
+				<ul>
+				    <li>AICS-HOME AUTH API : <a href="%s" target="_blank">%s</a></li>
+				</ul>
+				""",
+			getAdminSwaggerByProfile(activeProfile),
+			getAdminSwaggerByProfile(activeProfile),
+			getAuthSwaggerByProfile(activeProfile),
+			getAuthSwaggerByProfile(activeProfile)
 		);
 	}
 
@@ -114,6 +125,11 @@ private String getAdminSwaggerByProfile(String profile) {
 		return url + ":" + adminApiPort + "/swagger-ui/index.html";
 	}
 
+	private String getAuthSwaggerByProfile(String profile) {
+		String url = (String) profileServerConfig.get(profile).get("url");
+		return url + ":" + authApiPort + "/swagger-ui/index.html";
+	}
+
 	private String getActiveProfile() {
 		return Arrays.stream(environment.getActiveProfiles())
 			.findFirst()

aics-api/src/main/resources/application-dev.yml

@@ -11,4 +11,5 @@ spring:
 profiles:
   current-ip: ${CURRENT_IP}
   api-port: ${API_SERVER_PORT:8080}
-  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  auth-api-port: ${AUTH_API_SERVER_PORT:8082}

aics-api/src/main/resources/application-local.yml

@@ -6,4 +6,5 @@ spring:
 profiles:
   current-ip: ${CURRENT_IP:localhost}
   api-port: ${API_SERVER_PORT:8080}
-  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
+  auth-api-port: ${AUTH_API_SERVER_PORT:8082}

aics-auth/build.gradle

@@ -0,0 +1,32 @@
+bootJar {
+    enabled = true
+}
+
+jar {
+    enabled = true
+}
+
+dependencies {
+    implementation project(':aics-domain')
+    implementation project(':aics-common')
+    implementation project(':aics-infra')
+    implementation project(':aics-global-utils')
+
+    testFixturesImplementation project(':aics-domain')
+    testFixturesImplementation project(':aics-common')
+    testFixturesImplementation project(':aics-infra')
+    testFixturesImplementation project(':aics-global-utils')
+
+    testFixturesImplementation testFixtures(project(':aics-domain'))
+    testFixturesImplementation testFixtures(project(':aics-global-utils'))
+}
+
+apply from: "../gradle/jacoco.gradle"
+
+jacocoTestReport {
+    dependsOn test
+    reports {
+        xml.required = true
+        html.required = true
+    }
+}

aics-auth/src/main/java/kgu/developers/auth/AicsAuthApplication.java

@@ -0,0 +1,13 @@
+package kgu.developers.auth;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AicsAuthApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AicsAuthApplication.class, args);
+	}
+
+}

aics-api/src/main/java/kgu/developers/api/auth/application/AuthService.java → aics-auth/src/main/java/kgu/developers/auth/api/application/AuthService.java

@@ -1,21 +1,20 @@
-package kgu.developers.api.auth.application;
+package kgu.developers.auth.api.application;
 
-import java.time.Duration;
-
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import kgu.developers.api.auth.presentation.exception.TokenNotFoundException;
-import kgu.developers.api.auth.presentation.request.LoginRequest;
-import kgu.developers.api.auth.presentation.request.RefreshTokenRequest;
-import kgu.developers.api.auth.presentation.response.TokenResponse;
+import kgu.developers.auth.api.presentation.exception.TokenNotFoundException;
+import kgu.developers.auth.api.presentation.request.LoginRequest;
+import kgu.developers.auth.api.presentation.request.RefreshTokenRequest;
+import kgu.developers.auth.api.presentation.response.TokenResponse;
 import kgu.developers.common.auth.jwt.TokenProvider;
 import kgu.developers.domain.refreshtoken.domain.RefreshToken;
 import kgu.developers.domain.refreshtoken.domain.RefreshTokenRepository;
 import kgu.developers.domain.user.application.query.UserQueryService;
 import kgu.developers.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Duration;
 
 @Service
 @RequiredArgsConstructor

aics-api/src/main/java/kgu/developers/api/auth/presentation/AuthController.java → aics-auth/src/main/java/kgu/developers/auth/api/presentation/AuthController.java

@@ -1,7 +1,4 @@
-package kgu.developers.api.auth.presentation;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
+package kgu.developers.auth.api.presentation;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -10,9 +7,11 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import kgu.developers.api.auth.presentation.request.LoginRequest;
-import kgu.developers.api.auth.presentation.request.RefreshTokenRequest;
-import kgu.developers.api.auth.presentation.response.TokenResponse;
+import kgu.developers.auth.api.presentation.request.LoginRequest;
+import kgu.developers.auth.api.presentation.request.RefreshTokenRequest;
+import kgu.developers.auth.api.presentation.response.TokenResponse;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @Tag(name = "Auth", description = "로그인 API")
 public interface AuthController {