Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ResponseEntity<ApiResponse<OAuthAuthorizeResponseDTO>> authorize(
@PathVariable String provider
) {
OAuthAuthorizeResponseDTO data = oauthService.buildAuthorizeUrl(provider);
return ResponseEntity.ok(ApiResponse.success("OAuth인증 코드 발급에 성공하였습니다.", data));
return ResponseEntity.ok(ApiResponse.success(data));
}

@Operation(
Expand All @@ -70,13 +70,13 @@ public ResponseEntity<ApiResponse<OAuthCallbackResponseDTO>> 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(
Expand All @@ -93,7 +93,7 @@ public ResponseEntity<ApiResponse<Void>> 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(
Expand All @@ -113,7 +113,7 @@ public ResponseEntity<ApiResponse<TermResponseDTO>> getTerms(

TermResponseDTO data = authService.getSignupTerms();

return ResponseEntity.ok(ApiResponse.success("회원 가입용 약관 조회에 성공하였습니다.", data));
return ResponseEntity.ok(ApiResponse.success(data));
}

@Operation(
Expand All @@ -137,7 +137,7 @@ public ResponseEntity<ApiResponse<SignupResponseDTO>> 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(
Expand All @@ -151,6 +151,6 @@ public ResponseEntity<ApiResponse<Void>> logout() {

return ResponseEntity.ok()
.header(HttpHeaders.SET_COOKIE, cookieProvider.expireRefreshTokenCookie().toString())
.body(ApiResponse.success("로그아웃이 완료되었습니다.", null));
.body(ApiResponse.success(null));
}
}
Original file line number Diff line number Diff line change
@@ -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()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.deare.backend.domain.term.entity.Term;

import java.time.LocalDateTime;
import java.util.List;

/**
Expand All @@ -11,28 +10,6 @@
public record TermResponseDTO(
List<TermItemDTO> 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<Term> terms) {
List<TermItemDTO> termItems = terms.stream()
.map(TermItemDTO::from)
Expand Down
Empty file.
4 changes: 2 additions & 2 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ 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

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
Expand Down