diff --git a/src/main/java/com/deare/backend/api/auth/controller/AuthController.java b/src/main/java/com/deare/backend/api/auth/controller/AuthController.java index b60c3cad..3a6c76fc 100644 --- a/src/main/java/com/deare/backend/api/auth/controller/AuthController.java +++ b/src/main/java/com/deare/backend/api/auth/controller/AuthController.java @@ -44,7 +44,7 @@ public ResponseEntity> authorize( @PathVariable String provider ) { OAuthAuthorizeResponseDTO data = oauthService.buildAuthorizeUrl(provider); - return ResponseEntity.ok(ApiResponse.success("OAuth인증 코드 발급에 성공하였습니다.", data)); + return ResponseEntity.ok(ApiResponse.success(data)); } @Operation( @@ -70,13 +70,13 @@ public ResponseEntity> callback( return ResponseEntity.ok() .header(HttpHeaders.AUTHORIZATION, "Bearer " + result.accessToken()) .header(HttpHeaders.SET_COOKIE, cookieProvider.createRefreshTokenCookie(result.refreshToken()).toString()) - .body(ApiResponse.success("소셜 로그인 인증에 성공하였습니다.", result.response())); + .body(ApiResponse.success(result.response())); } // 신규 회원 -> Signup Token : HttpOnly Cookie return ResponseEntity.ok() .header(HttpHeaders.SET_COOKIE, cookieProvider.createSignupTokenCookie(result.signupToken()).toString()) - .body(ApiResponse.success("소셜 로그인 인증에 성공하였습니다.", result.response())); + .body(ApiResponse.success(result.response())); } @Operation( @@ -93,7 +93,7 @@ public ResponseEntity> refresh( return ResponseEntity.ok() .header(HttpHeaders.AUTHORIZATION, "Bearer " + tokenPair.accessToken()) .header(HttpHeaders.SET_COOKIE, cookieProvider.createRefreshTokenCookie(tokenPair.refreshToken()).toString()) - .body(ApiResponse.success("토큰 발행에 성공하였습니다.", null)); + .body(ApiResponse.success(null)); } @Operation( @@ -113,7 +113,7 @@ public ResponseEntity> getTerms( TermResponseDTO data = authService.getSignupTerms(); - return ResponseEntity.ok(ApiResponse.success("회원 가입용 약관 조회에 성공하였습니다.", data)); + return ResponseEntity.ok(ApiResponse.success(data)); } @Operation( @@ -137,7 +137,7 @@ public ResponseEntity> signup( .header(HttpHeaders.AUTHORIZATION, "Bearer " + result.tokenPair().accessToken()) .header(HttpHeaders.SET_COOKIE, cookieProvider.createRefreshTokenCookie(result.tokenPair().refreshToken()).toString()) .header(HttpHeaders.SET_COOKIE, cookieProvider.expireSignupTokenCookie().toString()) - .body(ApiResponse.success("회원가입에 성공하였습니다.", result.response())); + .body(ApiResponse.success(result.response())); } @Operation( @@ -151,6 +151,6 @@ public ResponseEntity> logout() { return ResponseEntity.ok() .header(HttpHeaders.SET_COOKIE, cookieProvider.expireRefreshTokenCookie().toString()) - .body(ApiResponse.success("로그아웃이 완료되었습니다.", null)); + .body(ApiResponse.success(null)); } } diff --git a/src/main/java/com/deare/backend/api/auth/dto/response/TermItemDTO.java b/src/main/java/com/deare/backend/api/auth/dto/response/TermItemDTO.java new file mode 100644 index 00000000..858642de --- /dev/null +++ b/src/main/java/com/deare/backend/api/auth/dto/response/TermItemDTO.java @@ -0,0 +1,30 @@ +package com.deare.backend.api.auth.dto.response; + +import com.deare.backend.domain.term.entity.Term; + +import java.time.LocalDateTime; + +/** + * 약관 개별 항목 응답 DTO + */ +public record TermItemDTO( + Long termId, + String title, + String type, + String content, + boolean isRequired, + LocalDateTime effectiveAt, + String version +) { + public static TermItemDTO from(Term term) { + return new TermItemDTO( + term.getId(), + term.getTitle(), + term.getType().name(), + term.getContent(), + term.isRequired(), + term.getEffectiveAt(), + term.getVersion() + ); + } +} diff --git a/src/main/java/com/deare/backend/api/auth/dto/response/TermResponseDTO.java b/src/main/java/com/deare/backend/api/auth/dto/response/TermResponseDTO.java index a0952e4e..c5364976 100644 --- a/src/main/java/com/deare/backend/api/auth/dto/response/TermResponseDTO.java +++ b/src/main/java/com/deare/backend/api/auth/dto/response/TermResponseDTO.java @@ -2,7 +2,6 @@ import com.deare.backend.domain.term.entity.Term; -import java.time.LocalDateTime; import java.util.List; /** @@ -11,28 +10,6 @@ public record TermResponseDTO( List terms ) { - public record TermItemDTO( - Long termId, - String title, - String type, - String content, - boolean isRequired, - LocalDateTime effectiveAt, - String version - ) { - public static TermItemDTO from(Term term) { - return new TermItemDTO( - term.getId(), - term.getTitle(), - term.getType().name(), - term.getContent(), - term.isRequired(), - term.getEffectiveAt(), - term.getVersion() - ); - } - } - public static TermResponseDTO from(List terms) { List termItems = terms.stream() .map(TermItemDTO::from) diff --git a/src/main/java/com/deare/backend/global/infra/redis/.gitkeep b/src/main/java/com/deare/backend/global/infra/redis/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 0ddb52c2..efbcbc36 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -66,7 +66,7 @@ oauth: kakao: client-id: ${KAKAO_CLIENT_ID} client-secret: ${KAKAO_CLIENT_SECRET} - redirect-uri: ${KAKAO_REDIRECT_URI:https://api.deare.kr/auth/oauth2/kakao/callback} + redirect-uri: ${KAKAO_REDIRECT_URI:https://www.deare.kr/auth/oauth2/kakao/callback} authorize-uri: https://kauth.kakao.com/oauth/authorize token-uri: https://kauth.kakao.com/oauth/token user-info-uri: https://kapi.kakao.com/v2/user/me @@ -74,7 +74,7 @@ oauth: google: client-id: ${GOOGLE_CLIENT_ID} client-secret: ${GOOGLE_CLIENT_SECRET} - redirect-uri: ${GOOGLE_REDIRECT_URI:https://api.deare.kr/auth/oauth2/google/callback} + redirect-uri: ${GOOGLE_REDIRECT_URI:https://www.deare.kr/auth/oauth2/google/callback} authorize-uri: https://accounts.google.com/o/oauth2/v2/auth token-uri: https://oauth2.googleapis.com/token user-info-uri: https://www.googleapis.com/oauth2/v3/userinfo