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
1 change: 1 addition & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
S3_BUCKET: ${{ secrets.S3_BUCKET }}
JWT_SECRET: ${{ secrets.JWT_SECRET }}
SQS_QUEUE_NAME: ${{ secrets.SQS_QUEUE_NAME }}
FRONTEND_URL: ${{ secrets.FRONTEND_URL }}
# GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
# GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
# GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/umc/codeplay/controller/OAuthController.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.util.LinkedMultiValueMap;
Expand Down Expand Up @@ -34,6 +35,9 @@
@Tag(name = "oauth-controller", description = "외부 소셜 로그인 서비스 연동 API, JWT 토큰 헤더 포함을 필요로 하지 않습니다.")
public class OAuthController {

@Value("${frontend.url}")
private String targetOrigin;

private final JwtUtil jwtUtil;
private final RestTemplate restTemplate = new RestTemplate();
private final GoogleOAuthProperties googleOAuthProperties;
Expand Down Expand Up @@ -121,8 +125,6 @@ public ResponseEntity<String> OAuthCallback(
// .build());
}

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

private String getString(String serviceAccessToken, String serviceRefreshToken, String email) {
String jsonData =
String.format(
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ spring:
starttls:
enable: true

frontend:
url:
${FRONTEND_URL}

s3:
bucket: ${S3_BUCKET}

Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ spring:
access-key: ${AWS_ACCESS_KEY_ID}
secret-key: ${AWS_SECRET_ACCESS_KEY}

frontend:
url:
${FRONTEND_URL}

s3:
bucket: ${S3_BUCKET}

Expand Down
Loading