Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Beakjiyeon committed Apr 6, 2024
2 parents 5dc8377 + 038c868 commit ed279b0
Showing 1 changed file with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ public ResponseEntity<SocialLoginResponse> memberSocialLogin(
) {
SocialLoginResponse response = authService.socialLoginMember(params);

String accessToken = response.accessToken();
String refreshToken = response.refreshToken();
HttpHeaders tokenHeaders = cookieUtil.generateTokenCookies(accessToken, refreshToken);
// String accessToken = response.accessToken();
// String refreshToken = response.refreshToken();
// HttpHeaders tokenHeaders = cookieUtil.generateTokenCookies(accessToken, refreshToken);

return ResponseEntity.ok().headers(tokenHeaders).body(response);
return ResponseEntity.ok()
// .headers(tokenHeaders)
.body(response);
}
}

0 comments on commit ed279b0

Please sign in to comment.