Skip to content

Commit 4a11b3e

Browse files
committed
배포 전 확인 작업 커밋
-파일 충돌 해결 및 주석 수정
1 parent 749ebd9 commit 4a11b3e

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/main/java/codeview/main/auth/controller/OAuth2Controller.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ public class OAuth2Controller {
1212
@GetMapping("/oauth2/callback/google")
1313
public String googleCallback(@AuthenticationPrincipal OAuth2User principal, Model model) {
1414
model.addAttribute("name", principal.getAttribute("name"));
15-
return "home"; // 로그인 성공 후 리다이렉트될 페이지
15+
return "home";
1616
}
1717

1818
@GetMapping("/oauth2/callback/github")
1919
public String githubCallback(@AuthenticationPrincipal OAuth2User principal, Model model) {
2020
model.addAttribute("name", principal.getAttribute("name"));
21-
return "home"; // 로그인 성공 후 리다이렉트될 페이지
21+
return "home";
2222
}
2323

2424
@GetMapping("/oauth2/callback/kakao")
2525
public String kakaoCallback(@AuthenticationPrincipal OAuth2User principal, Model model) {
2626
model.addAttribute("name", principal.getAttribute("nickname"));
27-
return "home"; // 로그인 성공 후 리다이렉트될 페이지
27+
return "home";
2828
}
2929
}

src/main/java/codeview/main/auth/dto/model/PrincipalDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public String getPassword() {
4343

4444
@Override
4545
public String getUsername() {
46-
return member.getEmail(); // 변경: memberKey 대신 email 사용
46+
return member.getEmail();
4747
}
4848

4949
@Override

src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ spring:
6868

6969
logging:
7070
level:
71-
org.springframework.security: DEBUG
71+
org.springframework.security: DEBUG

src/test/java/codeview/main/auth/jwt/TokenProviderTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ void testValidateToken_ValidToken() {
4747

4848
@Test
4949
void testValidateToken_ExpiredToken() {
50-
// Expired token generation
5150
String expiredToken = Jwts.builder()
5251
.setSubject("[email protected]")
5352
.setIssuedAt(new Date(System.currentTimeMillis() - 10000))

0 commit comments

Comments
 (0)