Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2120626
Authorization feature
johnjal Jan 10, 2025
4c2a6f7
Authentication feature implemented
johnjal Jan 11, 2025
2ce5b38
bug fix
johnjal Jan 11, 2025
a438e4a
fix conflict
johnjal Jan 12, 2025
585ba05
refresh token
johnjal Jan 17, 2025
0c03859
minor issues fixed
johnjal Jan 17, 2025
edb0693
merge
johnjal Jan 22, 2025
629e6ad
google login
johnjal Jan 24, 2025
333d75e
kakao added
johnjal Jan 25, 2025
78c9b70
merge
johnjal Jan 25, 2025
7e96d91
pre merge
johnjal Feb 3, 2025
d09fddd
Merge branch 'Develop' of https://github.com/johnjal/CodePlay-BE into…
johnjal Feb 3, 2025
d1009e7
name attribute deleted
johnjal Feb 6, 2025
76372e6
minor fix
johnjal Feb 6, 2025
7fa4382
conflict resolve
johnjal Feb 9, 2025
1e77ac0
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 9, 2025
09aaa97
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 12, 2025
2f147c2
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 16, 2025
a578b03
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 16, 2025
3e0c127
Merge remote-tracking branch 'origin/Develop' into develop
johnjal Feb 18, 2025
ae19c84
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 20, 2025
f93362f
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 20, 2025
81ab2ba
Merge branch 'Develop' of https://github.com/UMC-CodePlay/CodePlay-BE…
johnjal Feb 20, 2025
7e920a6
final fix
johnjal Feb 20, 2025
07ec886
realfinalfix
johnjal Feb 20, 2025
7dd771e
Merge branch 'Develop' into fix-fronturltoenv
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
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