Skip to content

6.2차 배포 #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chan0831 merged 5 commits into from
Feb 20, 2025
Merged

6.2차 배포 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2af4df4
[Feat]비번찾기이메일설정(#155)
chan0831 Feb 19, 2025
59598b5
[Feat] oauthpop (#165)
johnjal Feb 20, 2025
9c6e30e
fix oauthpop (#166)
johnjal Feb 20, 2025
937213c
fix application-prod (#167)
2020147542 Feb 20, 2025
b38a9ae
환경 설정 순서 변경 (#168)
2020147542 Feb 20, 2025
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
45 changes: 36 additions & 9 deletions src/main/java/umc/codeplay/controller/OAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import umc.codeplay.apiPayLoad.ApiResponse;
import umc.codeplay.apiPayLoad.code.status.ErrorStatus;
import umc.codeplay.apiPayLoad.exception.handler.GeneralHandler;
import umc.codeplay.config.properties.BaseOAuthProperties;
import umc.codeplay.config.properties.GoogleOAuthProperties;
import umc.codeplay.config.properties.KakaoOAuthProperties;
import umc.codeplay.domain.Member;
import umc.codeplay.domain.enums.SocialStatus;
import umc.codeplay.dto.MemberResponseDTO;
import umc.codeplay.jwt.JwtUtil;
import umc.codeplay.service.MemberService;

Expand Down Expand Up @@ -65,7 +63,7 @@ public RedirectView redirectToOAuth(@PathVariable("provider") String provider) {

@Hidden
@GetMapping("/callback/{provider}")
public ApiResponse<MemberResponseDTO.LoginResultDTO> OAuthCallback(
public ResponseEntity<String> OAuthCallback(
@RequestParam("code") String code, @PathVariable("provider") String provider) {
BaseOAuthProperties properties =
switch (provider) {
Expand Down Expand Up @@ -110,13 +108,42 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> OAuthCallback(
String serviceAccessToken = jwtUtil.generateToken(email, authorities);
String serviceRefreshToken = jwtUtil.generateRefreshToken(email, authorities);

String html = getString(serviceAccessToken, serviceRefreshToken, email);

return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(html);

// (6) 최종적으로 JWT(액세스/리프레시)를 프론트에 응답
return ApiResponse.onSuccess(
MemberResponseDTO.LoginResultDTO.builder()
.email(email)
.token(serviceAccessToken)
.refreshToken(serviceRefreshToken)
.build());
// return ApiResponse.onSuccess(
// MemberResponseDTO.LoginResultDTO.builder()
// .email(email)
// .token(serviceAccessToken)
// .refreshToken(serviceRefreshToken)
// .build());
}

String targetOrigin = "https://code-play-fe.vercel.app";

private String getString(String serviceAccessToken, String serviceRefreshToken, String email) {
String jsonData =
String.format(
"{ \"accessToken\": \"%s\", \"refreshToken\": \"%s\", \"email\": \"%s\" }",
serviceAccessToken, serviceRefreshToken, email);

return """
<!DOCTYPE html>
<html>
<body>
<script>
(function() {
var data = %s;
window.opener.postMessage(data, "%s");
window.close();
})();
</script>
</body>
</html>
"""
.formatted(jsonData, targetOrigin);
}

private Map<String, Object> requestOAuthToken(String code, BaseOAuthProperties properties) {
Expand Down
13 changes: 13 additions & 0 deletions src/main/resources/application-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,19 @@ spring:
access-key: ${AWS_ACCESS_KEY_ID}
secret-key: ${AWS_SECRET_ACCESS_KEY}

mail:
host: smtp.gmail.com
port: 587
username: ${SPRING_MAIL_USERNAME} # 이메일 계정
password: ${SPRING_MAIL_PASSWORD}
protocol: smtp
properties:
mail:
smtp:
auth: true
starttls:
enable: true

s3:
bucket: ${S3_BUCKET}

Expand Down
21 changes: 13 additions & 8 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
spring:
application:
name: codeplay
mail:
host: smtp.gmail.com
port: 587
username: dummy-email@gmail.com # 이메일 계정
password: dummy-password
protocol: smt
tls: true


config:
import:
Expand Down Expand Up @@ -36,6 +28,19 @@ spring:
use_sql_comments: true
default_batch_fetch_size: 1000 # 배치 크기 설정 (성능 최적화)

mail:
host: smtp.gmail.com
port: 587
username: ${SPRING_MAIL_USERNAME} # 이메일 계정
password: ${SPRING_MAIL_PASSWORD}
protocol: smtp
properties:
mail:
smtp:
auth: true
starttls:
enable: true

cloud:
aws:
region:
Expand Down
Loading