diff --git a/api/src/main/java/org/sopt/makers/api/common/config/CorsConfig.java b/api/src/main/java/org/sopt/makers/api/common/config/CorsConfig.java index 04d371cf..0731aedc 100644 --- a/api/src/main/java/org/sopt/makers/api/common/config/CorsConfig.java +++ b/api/src/main/java/org/sopt/makers/api/common/config/CorsConfig.java @@ -22,7 +22,13 @@ public CorsConfigurationSource corsConfigurationSource() { config.setAllowedOrigins(Arrays.asList(CORS_ALLOWED_ORIGINS)); config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")); config.setAllowedHeaders( - List.of("Authorization", "Content-Type", API_KEY_HEADER, SERVICE_NAME_HEADER)); + List.of( + "Authorization", + "Content-Type", + "api-key", + "session-id", + API_KEY_HEADER, + SERVICE_NAME_HEADER)); config.setAllowCredentials(true); config.setMaxAge(3600L); diff --git a/api/src/main/java/org/sopt/makers/api/common/factory/CookieFactory.java b/api/src/main/java/org/sopt/makers/api/common/factory/CookieFactory.java index 92b21db0..4d20eca4 100644 --- a/api/src/main/java/org/sopt/makers/api/common/factory/CookieFactory.java +++ b/api/src/main/java/org/sopt/makers/api/common/factory/CookieFactory.java @@ -1,5 +1,7 @@ package org.sopt.makers.api.common.factory; +import static org.sopt.makers.api.common.security.CookieConstant.ADMIN_REFRESH_TOKEN_COOKIE; + import java.time.Duration; import lombok.RequiredArgsConstructor; import org.sopt.makers.api.common.config.SecurityProperty; @@ -10,7 +12,6 @@ @Component @RequiredArgsConstructor public class CookieFactory { - private static final String REFRESH_TOKEN_COOKIE_NAME = "refreshToken"; private static final String COOKIE_DOMAIN = ".sopt.org"; private static final String SAME_SITE_NONE = "None"; private static final String ROOT_PATH = "/"; @@ -18,9 +19,13 @@ public class CookieFactory { private final SecurityProperty securityProperty; public HttpHeaders setRefreshToken(final String refreshToken) { + return setRefreshToken(refreshToken, ADMIN_REFRESH_TOKEN_COOKIE); + } + + public HttpHeaders setRefreshToken(final String refreshToken, final String cookieName) { long durationSeconds = securityProperty.jwt().secret().expiration().refreshTokenExpiration(); ResponseCookie cookie = - ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken) + ResponseCookie.from(cookieName, refreshToken) .httpOnly(true) .secure(true) .sameSite(SAME_SITE_NONE) diff --git a/api/src/main/java/org/sopt/makers/api/common/security/CookieConstant.java b/api/src/main/java/org/sopt/makers/api/common/security/CookieConstant.java new file mode 100644 index 00000000..5aa1524e --- /dev/null +++ b/api/src/main/java/org/sopt/makers/api/common/security/CookieConstant.java @@ -0,0 +1,8 @@ +package org.sopt.makers.api.common.security; + +public final class CookieConstant { + public static final String AUTH_REFRESH_TOKEN_COOKIE = "Refresh-Token"; + public static final String ADMIN_REFRESH_TOKEN_COOKIE = "refreshToken"; + + private CookieConstant() {} +} diff --git a/api/src/main/java/org/sopt/makers/api/common/security/SecurityConstant.java b/api/src/main/java/org/sopt/makers/api/common/security/SecurityConstant.java index 968d871d..306cc1a7 100644 --- a/api/src/main/java/org/sopt/makers/api/common/security/SecurityConstant.java +++ b/api/src/main/java/org/sopt/makers/api/common/security/SecurityConstant.java @@ -21,6 +21,11 @@ private SecurityConstant() {} "http://localhost:5173", "https://sopt-internal-dev.sopt.org", "https://playground.sopt.org", + "https://sopt.org", + "https://www.sopt.org", + "https://www.dev.sopt.org", + "https://admins.sopt.org", + "https://dev.admins.sopt.org", "https://sopt-auth-frontend-test.pages.dev", "https://sopt-org-frontend-git-test-daeuns-projects-025386f4.vercel.app", "https://sopt-operation-frontend-3yc.pages.dev" diff --git a/api/src/main/java/org/sopt/makers/api/controller/admin/auth/AdminAuthController.java b/api/src/main/java/org/sopt/makers/api/controller/admin/auth/AdminAuthController.java index b77dcaa7..15a7a565 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/admin/auth/AdminAuthController.java +++ b/api/src/main/java/org/sopt/makers/api/controller/admin/auth/AdminAuthController.java @@ -1,5 +1,6 @@ package org.sopt.makers.api.controller.admin.auth; +import static org.sopt.makers.api.common.security.CookieConstant.ADMIN_REFRESH_TOKEN_COOKIE; import static org.sopt.makers.api.controller.admin.auth.AdminAuthSuccessCode.SUCCESS_CHANGE_PASSWORD; import static org.sopt.makers.api.controller.admin.auth.AdminAuthSuccessCode.SUCCESS_LOGIN; import static org.sopt.makers.api.controller.admin.auth.AdminAuthSuccessCode.SUCCESS_REFRESH_TOKEN; @@ -31,8 +32,6 @@ @RequestMapping("/api/v1/auth") public class AdminAuthController implements AdminAuthApi { - private static final String REFRESH_TOKEN_COOKIE = "refreshToken"; - private final AdminAuthService adminAuthService; private final CookieFactory cookieFactory; @@ -49,7 +48,7 @@ public ResponseEntity> login( @Override @PatchMapping("/refresh") public ResponseEntity> refresh( - @CookieValue(value = REFRESH_TOKEN_COOKIE) String refreshToken) { + @CookieValue(value = ADMIN_REFRESH_TOKEN_COOKIE) String refreshToken) { AdminTokenPair tokenPair = adminAuthService.refresh(refreshToken); HttpHeaders headers = cookieFactory.setRefreshToken(tokenPair.refreshToken()); return ResponseFactory.success( diff --git a/api/src/main/java/org/sopt/makers/api/controller/auth/AuthController.java b/api/src/main/java/org/sopt/makers/api/controller/auth/AuthController.java index 7939e3a4..3d1f498c 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/auth/AuthController.java +++ b/api/src/main/java/org/sopt/makers/api/controller/auth/AuthController.java @@ -1,5 +1,6 @@ package org.sopt.makers.api.controller.auth; +import static org.sopt.makers.api.common.security.CookieConstant.AUTH_REFRESH_TOKEN_COOKIE; import static org.sopt.makers.api.controller.auth.AuthSuccessCode.CREATE_PHONE_VERIFICATION; import static org.sopt.makers.api.controller.auth.AuthSuccessCode.LOGIN; import static org.sopt.makers.api.controller.auth.AuthSuccessCode.REFRESH_TOKEN; @@ -40,8 +41,6 @@ @RequiredArgsConstructor public class AuthController implements AuthApi { - private static final String REFRESH_TOKEN_COOKIE = "refreshToken"; - private final AuthFacade authFacade; private final CookieFactory cookieFactory; @@ -69,7 +68,8 @@ public ResponseEntity> verifyPhoneVerification( public ResponseEntity> loginFromWeb(@RequestBody LoginRequest request) { OAuthPlatform platform = OAuthPlatform.find(request.authPlatform()); AuthFacade.LoginResult result = authFacade.login(request.token(), platform); - HttpHeaders headers = cookieFactory.setRefreshToken(result.refreshToken()); + HttpHeaders headers = + cookieFactory.setRefreshToken(result.refreshToken(), AUTH_REFRESH_TOKEN_COOKIE); return ResponseFactory.success(LOGIN, headers, LoginForWebResponse.from(result)); } @@ -93,12 +93,13 @@ public ResponseEntity> signUp(@RequestBody SignUpRequest request @PostMapping("/refresh/web") public ResponseEntity> refreshFromWeb( @RequestHeader(HttpHeaders.AUTHORIZATION) String accessToken, - @CookieValue(value = REFRESH_TOKEN_COOKIE, required = false) String refreshToken) { + @CookieValue(value = AUTH_REFRESH_TOKEN_COOKIE, required = false) String refreshToken) { if (refreshToken == null) { throw new AuthException(REFRESH_TOKEN_NOT_FOUND); } TokenIssuerPort.TokenPair tokenPair = authFacade.refresh(accessToken, refreshToken); - HttpHeaders headers = cookieFactory.setRefreshToken(tokenPair.refreshToken()); + HttpHeaders headers = + cookieFactory.setRefreshToken(tokenPair.refreshToken(), AUTH_REFRESH_TOKEN_COOKIE); return ResponseFactory.success(REFRESH_TOKEN, headers, RefreshForWebResponse.from(tokenPair)); } diff --git a/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountApi.java b/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountApi.java index 5157d6de..f971e3d0 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountApi.java +++ b/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountApi.java @@ -1,8 +1,8 @@ package org.sopt.makers.api.controller.auth; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.sopt.makers.api.controller.auth.dto.GetSocialAccountPlatformRequest; import org.sopt.makers.api.controller.auth.dto.UpdateSocialAccountRequest; import org.sopt.makers.core.response.BaseResponse; import org.springframework.http.ResponseEntity; @@ -11,7 +11,9 @@ public interface SocialAccountApi { @Operation(summary = "소셜 플랫폼 조회") - ResponseEntity> getSocialPlatform(GetSocialAccountPlatformRequest request); + ResponseEntity> getSocialPlatform( + @Parameter(description = "이름", required = false) String name, + @Parameter(description = "전화번호", required = true) String phone); @Operation(summary = "소셜 계정 변경") ResponseEntity> updateSocialAccount(UpdateSocialAccountRequest request); diff --git a/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountController.java b/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountController.java index 859b57c8..bdf2665f 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountController.java +++ b/api/src/main/java/org/sopt/makers/api/controller/auth/SocialAccountController.java @@ -6,17 +6,17 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.sopt.makers.api.common.factory.ResponseFactory; -import org.sopt.makers.api.controller.auth.dto.GetSocialAccountPlatformRequest; import org.sopt.makers.api.controller.auth.dto.SocialAccountPlatformResponse; import org.sopt.makers.api.controller.auth.dto.UpdateSocialAccountRequest; import org.sopt.makers.core.response.BaseResponse; import org.sopt.makers.core.type.OAuthPlatform; import org.sopt.makers.domain.auth.facade.AuthFacade; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -27,10 +27,11 @@ public class SocialAccountController implements SocialAccountApi { private final AuthFacade authFacade; @Override - @PostMapping("/platform") + @GetMapping("/platform") public ResponseEntity> getSocialPlatform( - @Valid @RequestBody GetSocialAccountPlatformRequest request) { - OAuthPlatform platform = authFacade.getSocialPlatform(request.phone()); + @RequestParam(value = "name", required = false) String name, + @RequestParam("phone") String phone) { + OAuthPlatform platform = authFacade.getSocialPlatform(phone); return ResponseFactory.success( GET_SOCIAL_ACCOUNT_PLATFORM, new SocialAccountPlatformResponse(platform.name())); } diff --git a/api/src/main/java/org/sopt/makers/api/controller/auth/dto/GetSocialAccountPlatformRequest.java b/api/src/main/java/org/sopt/makers/api/controller/auth/dto/GetSocialAccountPlatformRequest.java deleted file mode 100644 index 152f3f23..00000000 --- a/api/src/main/java/org/sopt/makers/api/controller/auth/dto/GetSocialAccountPlatformRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.sopt.makers.api.controller.auth.dto; - -import jakarta.validation.constraints.NotBlank; - -public record GetSocialAccountPlatformRequest( - @NotBlank(message = "전화번호는 필수 입력 값입니다.") String phone) {} diff --git a/api/src/test/java/org/sopt/makers/api/common/config/CorsConfigTest.java b/api/src/test/java/org/sopt/makers/api/common/config/CorsConfigTest.java new file mode 100644 index 00000000..46e3dbca --- /dev/null +++ b/api/src/test/java/org/sopt/makers/api/common/config/CorsConfigTest.java @@ -0,0 +1,97 @@ +package org.sopt.makers.api.common.config; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.springframework.http.HttpHeaders; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.web.cors.DefaultCorsProcessor; + +class CorsConfigTest { + @ParameterizedTest + @ValueSource( + strings = { + "https://sopt.org", + "https://www.sopt.org", + "https://www.dev.sopt.org", + "https://admins.sopt.org", + "https://dev.admins.sopt.org" + }) + @DisplayName("공식 홈페이지와 관리자 페이지의 API 키 사전 요청을 허용한다") + void allowsPageOrigins(String origin) throws Exception { + MockHttpServletRequest request = preflight(origin); + MockHttpServletResponse response = new MockHttpServletResponse(); + + boolean allowed = + new DefaultCorsProcessor() + .processRequest( + new CorsConfig().corsConfigurationSource().getCorsConfiguration(request), + request, + response); + + assertThat(allowed).isTrue(); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).isEqualTo(origin); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS)) + .containsIgnoringCase("api-key") + .containsIgnoringCase("X-Api-Key") + .containsIgnoringCase("X-Service-Name") + .containsIgnoringCase("Authorization"); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)).isEqualTo("true"); + } + + @Test + @DisplayName("공식 홈페이지의 솝트스토리 조회에 세션 ID 헤더를 허용한다") + void allowsSessionIdHeader() throws Exception { + MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/v2/soptstory"); + request.addHeader(HttpHeaders.ORIGIN, "https://www.sopt.org"); + request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET"); + request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS, "session-id"); + MockHttpServletResponse response = new MockHttpServletResponse(); + + boolean allowed = + new DefaultCorsProcessor() + .processRequest( + new CorsConfig().corsConfigurationSource().getCorsConfiguration(request), + request, + response); + + assertThat(allowed).isTrue(); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)) + .isEqualTo("https://www.sopt.org"); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS)) + .containsIgnoringCase("session-id"); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS)).contains("GET"); + } + + @Test + @DisplayName("등록되지 않은 도메인의 사전 요청을 차단한다") + void rejectsUnknownOrigin() throws Exception { + MockHttpServletRequest request = preflight("https://unregistered.example.com"); + MockHttpServletResponse response = new MockHttpServletResponse(); + + boolean allowed = + new DefaultCorsProcessor() + .processRequest( + new CorsConfig().corsConfigurationSource().getCorsConfiguration(request), + request, + response); + + assertThat(allowed).isFalse(); + assertThat(response.getStatus()).isEqualTo(403); + assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).isNull(); + } + + private MockHttpServletRequest preflight(String origin) { + MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/v2/admin"); + request.addHeader(HttpHeaders.ORIGIN, origin); + request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST"); + request.addHeader( + HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS, + "Content-Type, Authorization, api-key, X-Api-Key, X-Service-Name"); + return request; + } +} diff --git a/api/src/test/java/org/sopt/makers/api/controller/auth/AuthLoginControllerTest.java b/api/src/test/java/org/sopt/makers/api/controller/auth/AuthLoginControllerTest.java new file mode 100644 index 00000000..3b0a623b --- /dev/null +++ b/api/src/test/java/org/sopt/makers/api/controller/auth/AuthLoginControllerTest.java @@ -0,0 +1,120 @@ +package org.sopt.makers.api.controller.auth; + +import static org.hamcrest.Matchers.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import jakarta.servlet.http.Cookie; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.sopt.makers.api.common.config.SecurityProperty; +import org.sopt.makers.api.common.factory.CookieFactory; +import org.sopt.makers.core.type.OAuthPlatform; +import org.sopt.makers.domain.auth.facade.AuthFacade; +import org.sopt.makers.domain.auth.port.TokenIssuerPort.TokenPair; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +class AuthLoginControllerTest { + private final AuthFacade facade = mock(AuthFacade.class); + private final SecurityProperty property = + new SecurityProperty( + new SecurityProperty.Api(Map.of("test", "key"), List.of("/actuator")), + new SecurityProperty.Jwt( + new SecurityProperty.Jwt.Secret( + new SecurityProperty.Jwt.Secret.Expiration(3600L, 1209600L), + "test-secret", + new SecurityProperty.Jwt.Secret.Issuer("test-issuer")))); + private final MockMvc mvc = + MockMvcBuilders.standaloneSetup(new AuthController(facade, new CookieFactory(property))) + .build(); + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + @DisplayName("웹 로그인은 액세스 토큰과 최초 로그인 여부 및 갱신 쿠키를 반환한다") + void logsInFromWeb(boolean firstLogin) throws Exception { + when(facade.login("social-token", OAuthPlatform.GOOGLE)) + .thenReturn(new AuthFacade.LoginResult("access", "refresh", firstLogin)); + mvc.perform( + post("/api/v1/auth/login/web") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"token\":\"social-token\",\"authPlatform\":\"GOOGLE\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.accessToken").value("access")) + .andExpect(jsonPath("$.data.isFirstLogin").value(firstLogin)) + .andExpect(jsonPath("$.data.refreshToken").doesNotExist()) + .andExpect( + header() + .string( + HttpHeaders.SET_COOKIE, + allOf( + startsWith("Refresh-Token=refresh;"), + containsString("Path=/"), + containsString("Domain=.sopt.org"), + containsString("Max-Age=1209600"), + containsString("HttpOnly"), + containsString("Secure"), + containsString("SameSite=None")))); + verify(facade).login("social-token", OAuthPlatform.GOOGLE); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + @DisplayName("앱 로그인은 액세스 토큰과 갱신 토큰 및 최초 로그인 여부를 반환한다") + void logsInFromApp(boolean firstLogin) throws Exception { + when(facade.login("social-token", OAuthPlatform.APPLE)) + .thenReturn(new AuthFacade.LoginResult("access", "refresh", firstLogin)); + mvc.perform( + post("/api/v1/auth/login/app") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"token\":\"social-token\",\"authPlatform\":\"APPLE\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.accessToken").value("access")) + .andExpect(jsonPath("$.data.refreshToken").value("refresh")) + .andExpect(jsonPath("$.data.isFirstLogin").value(firstLogin)) + .andExpect(header().doesNotExist(HttpHeaders.SET_COOKIE)); + verify(facade).login("social-token", OAuthPlatform.APPLE); + } + + @ParameterizedTest + @ValueSource(strings = {"GOOGLE", "APPLE"}) + @DisplayName("이름과 전화번호 및 소셜 인증 정보로 회원가입을 요청한다") + void signsUp(String platform) throws Exception { + mvc.perform( + post("/api/v1/auth/signup") + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"name":"홍길동","phone":"01012345678","token":"social-token","authPlatform":"%s"} + """ + .formatted(platform))) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.data").isEmpty()); + verify(facade).signUp("social-token", "01012345678", OAuthPlatform.find(platform)); + } + + @Test + @DisplayName("웹 갱신은 로그인에서 발급한 이름의 쿠키를 받아 다시 발급한다") + void refreshesWithLoginCookie() throws Exception { + when(facade.refresh("Bearer access", "refresh")) + .thenReturn(new TokenPair("new-access", "new-refresh")); + mvc.perform( + post("/api/v1/auth/refresh/web") + .header(HttpHeaders.AUTHORIZATION, "Bearer access") + .cookie(new Cookie("Refresh-Token", "refresh"))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.accessToken").value("new-access")) + .andExpect( + header().string(HttpHeaders.SET_COOKIE, startsWith("Refresh-Token=new-refresh;"))); + verify(facade).refresh("Bearer access", "refresh"); + } +} diff --git a/api/src/test/java/org/sopt/makers/api/controller/auth/AuthRefreshControllerTest.java b/api/src/test/java/org/sopt/makers/api/controller/auth/AuthRefreshControllerTest.java new file mode 100644 index 00000000..2ef112dc --- /dev/null +++ b/api/src/test/java/org/sopt/makers/api/controller/auth/AuthRefreshControllerTest.java @@ -0,0 +1,113 @@ +package org.sopt.makers.api.controller.auth; + +import static org.hamcrest.Matchers.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import jakarta.servlet.http.Cookie; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.sopt.makers.api.common.config.SecurityProperty; +import org.sopt.makers.api.common.exception.GlobalExceptionHandler; +import org.sopt.makers.api.common.factory.CookieFactory; +import org.sopt.makers.domain.auth.facade.AuthFacade; +import org.sopt.makers.domain.auth.port.TokenIssuerPort.TokenPair; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +class AuthRefreshControllerTest { + private final AuthFacade facade = mock(AuthFacade.class); + private final SecurityProperty property = + new SecurityProperty( + new SecurityProperty.Api(Map.of("test", "key"), List.of("/actuator")), + new SecurityProperty.Jwt( + new SecurityProperty.Jwt.Secret( + new SecurityProperty.Jwt.Secret.Expiration(3600L, 1209600L), + "test-secret", + new SecurityProperty.Jwt.Secret.Issuer("test-issuer")))); + private final MockMvc mvc = + MockMvcBuilders.standaloneSetup(new AuthController(facade, new CookieFactory(property))) + .setControllerAdvice(new GlobalExceptionHandler()) + .build(); + + @Test + @DisplayName("웹 토큰 갱신은 새 액세스 토큰과 갱신 쿠키를 반환한다") + void refreshesWebTokens() throws Exception { + when(facade.refresh("Bearer expired-access", "refresh")) + .thenReturn(new TokenPair("new-access", "new-refresh")); + mvc.perform( + post("/api/v1/auth/refresh/web") + .header(HttpHeaders.AUTHORIZATION, "Bearer expired-access") + .cookie(new Cookie("Refresh-Token", "refresh"))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.accessToken").value("new-access")) + .andExpect(jsonPath("$.data.refreshToken").doesNotExist()) + .andExpect( + header() + .string( + HttpHeaders.SET_COOKIE, + allOf( + startsWith("Refresh-Token=new-refresh;"), + containsString("Path=/"), + containsString("Domain=.sopt.org"), + containsString("Max-Age=1209600"), + containsString("HttpOnly"), + containsString("Secure"), + containsString("SameSite=None")))); + verify(facade).refresh("Bearer expired-access", "refresh"); + } + + @Test + @DisplayName("웹 갱신 쿠키가 없으면 401을 반환한다") + void requiresRefreshCookie() throws Exception { + mvc.perform( + post("/api/v1/auth/refresh/web") + .header(HttpHeaders.AUTHORIZATION, "Bearer expired-access")) + .andExpect(status().isUnauthorized()) + .andExpect(header().doesNotExist(HttpHeaders.SET_COOKIE)); + verifyNoInteractions(facade); + } + + @Test + @DisplayName("웹 갱신 요청에 Authorization 헤더가 없으면 400을 반환한다") + void requiresAuthorizationHeader() throws Exception { + mvc.perform(post("/api/v1/auth/refresh/web").cookie(new Cookie("Refresh-Token", "refresh"))) + .andExpect(status().isBadRequest()); + verifyNoInteractions(facade); + } + + @Test + @DisplayName("앱 토큰 갱신은 본문의 토큰을 전달하고 새 토큰 쌍을 반환한다") + void refreshesAppTokens() throws Exception { + when(facade.refresh("Bearer expired-access", "refresh")) + .thenReturn(new TokenPair("new-access", "new-refresh")); + mvc.perform( + post("/api/v1/auth/refresh/app") + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"accessToken":"Bearer expired-access","refreshToken":"refresh"} + """)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.accessToken").value("new-access")) + .andExpect(jsonPath("$.data.refreshToken").value("new-refresh")) + .andExpect(header().doesNotExist(HttpHeaders.SET_COOKIE)); + verify(facade).refresh("Bearer expired-access", "refresh"); + } + + @Test + @DisplayName("앱 갱신 요청의 본문이 없으면 400을 반환한다") + void requiresAppBody() throws Exception { + mvc.perform(post("/api/v1/auth/refresh/app").contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isBadRequest()); + verifyNoInteractions(facade); + } +} diff --git a/api/src/test/java/org/sopt/makers/api/controller/auth/PhoneVerificationControllerTest.java b/api/src/test/java/org/sopt/makers/api/controller/auth/PhoneVerificationControllerTest.java new file mode 100644 index 00000000..7b7a9538 --- /dev/null +++ b/api/src/test/java/org/sopt/makers/api/controller/auth/PhoneVerificationControllerTest.java @@ -0,0 +1,97 @@ +package org.sopt.makers.api.controller.auth; + +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.sopt.makers.api.common.factory.CookieFactory; +import org.sopt.makers.domain.auth.PhoneVerificationType; +import org.sopt.makers.domain.auth.facade.AuthFacade; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +class PhoneVerificationControllerTest { + private final AuthFacade facade = mock(AuthFacade.class); + private final MockMvc mvc = + MockMvcBuilders.standaloneSetup(new AuthController(facade, mock(CookieFactory.class))) + .build(); + + @ParameterizedTest + @EnumSource( + value = PhoneVerificationType.class, + names = "CHANGE_PHONE_NUMBER", + mode = EnumSource.Mode.EXCLUDE) + @DisplayName("사용자 ID 없이 목적별 전화번호 인증번호 발송을 요청한다") + void createsVerification(PhoneVerificationType type) throws Exception { + mvc.perform( + post("/api/v1/auth/phone") + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"name":null,"phone":"01012345678","type":"%s"} + """ + .formatted(type.name()))) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.data").isEmpty()); + verify(facade).createPhoneVerification(null, "01012345678", type); + } + + @ParameterizedTest + @EnumSource(value = PhoneVerificationType.class, names = "CHANGE_PHONE_NUMBER") + @DisplayName("사용자 ID를 전달해 전화번호 변경 인증번호 발송을 요청한다") + void createsPhoneChangeVerification(PhoneVerificationType type) throws Exception { + mvc.perform( + post("/api/v1/auth/phone") + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"userId":1,"phone":"01012345678","type":"%s"} + """ + .formatted(type.name()))) + .andExpect(status().isCreated()); + verify(facade).createPhoneVerification(1L, "01012345678", type); + } + + @ParameterizedTest + @EnumSource(PhoneVerificationType.class) + @DisplayName("목적별 인증번호를 검증하고 이름과 전화번호를 반환한다") + void verifiesCode(PhoneVerificationType type) throws Exception { + when(facade.verifyPhoneCode("01012345678", "012345", type)) + .thenReturn(new AuthFacade.VerifyResult("홍길동", "01012345678")); + mvc.perform( + post("/api/v1/auth/verify/phone") + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"phone":"01012345678","code":"012345","type":"%s"} + """ + .formatted(type.name()))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.name").value("홍길동")) + .andExpect(jsonPath("$.data.phone").value("01012345678")); + verify(facade).verifyPhoneCode("01012345678", "012345", type); + } + + @ParameterizedTest + @EnumSource(PhoneVerificationType.class) + @DisplayName("이름 필드가 포함된 요청도 인증번호를 검증한다") + void verifiesCodeWithName(PhoneVerificationType type) throws Exception { + when(facade.verifyPhoneCode("01012345678", "012345", type)) + .thenReturn(new AuthFacade.VerifyResult("홍길동", "01012345678")); + mvc.perform( + post("/api/v1/auth/verify/phone") + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"name":"홍길동","phone":"01012345678","code":"012345","type":"%s"} + """ + .formatted(type.name()))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.name").value("홍길동")); + verify(facade).verifyPhoneCode("01012345678", "012345", type); + } +} diff --git a/api/src/test/java/org/sopt/makers/api/controller/auth/SocialAccountControllerTest.java b/api/src/test/java/org/sopt/makers/api/controller/auth/SocialAccountControllerTest.java new file mode 100644 index 00000000..0bf24ef4 --- /dev/null +++ b/api/src/test/java/org/sopt/makers/api/controller/auth/SocialAccountControllerTest.java @@ -0,0 +1,61 @@ +package org.sopt.makers.api.controller.auth; + +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.sopt.makers.core.type.OAuthPlatform; +import org.sopt.makers.domain.auth.facade.AuthFacade; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +class SocialAccountControllerTest { + private final AuthFacade facade = mock(AuthFacade.class); + private final MockMvc mvc = + MockMvcBuilders.standaloneSetup(new SocialAccountController(facade)).build(); + private static final String BASE = "/api/v1/social/accounts"; + + @Test + @DisplayName("전화번호로 가입한 소셜 플랫폼을 조회한다") + void getsPlatform() throws Exception { + when(facade.getSocialPlatform("01012345678")).thenReturn(OAuthPlatform.GOOGLE); + mvc.perform(get(BASE + "/platform").param("phone", "01012345678")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.platform").value("GOOGLE")); + verify(facade).getSocialPlatform("01012345678"); + } + + @Test + @DisplayName("이름을 함께 전달해도 소셜 플랫폼을 조회한다") + void getsPlatformWithName() throws Exception { + when(facade.getSocialPlatform("01012345678")).thenReturn(OAuthPlatform.APPLE); + mvc.perform(get(BASE + "/platform").param("name", "홍길동").param("phone", "01012345678")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.platform").value("APPLE")); + verify(facade).getSocialPlatform("01012345678"); + } + + @Test + @DisplayName("전화번호가 없으면 조회 요청을 거절한다") + void requiresPhone() throws Exception { + mvc.perform(get(BASE + "/platform")).andExpect(status().isBadRequest()); + verifyNoInteractions(facade); + } + + @Test + @DisplayName("전화번호와 토큰 및 플랫폼으로 소셜 계정을 변경한다") + void updatesAccount() throws Exception { + mvc.perform( + patch(BASE) + .contentType(MediaType.APPLICATION_JSON) + .content( + """ + {"phone":"01012345678","token":"social-token","authPlatform":"APPLE"} + """)) + .andExpect(status().isOk()); + verify(facade).updateSocialAccount("01012345678", "social-token", OAuthPlatform.APPLE); + } +}