Skip to content

merge: develop <- feature/auth-security #5 #52

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
fprh13 merged 2 commits into from
Jan 23, 2025
Merged

merge: develop <- feature/auth-security #5 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c540d83
fix: 재발급 시도 시 refreshToken도 재발급하는 설계 오류 해결 #5
fprh13 Jan 23, 2025
40e06ea
chore: ddl 설정 수정
fprh13 Jan 23, 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
2 changes: 0 additions & 2 deletions lms/src/main/java/com/example/lms/domain/user/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ public ResponseEntity<?> reissue(HttpServletRequest request) {
}

String newAccessToken = tokenProvider.createAccessToken(subject, role, new Date());
String newRefreshToken = tokenProvider.createRefreshToken(subject, role, new Date());
return ResponseEntity.status(OK)
.header(AUTHORIZATION_HEADER, newAccessToken)
.header(COOKIE_PREFIX, createCookie(REFRESH_TOKEN_COOKIE_NAME, newRefreshToken, tokenProvider.getRefreshTokenExpirationSeconds()).toString())
.body(null);
}

Expand Down
2 changes: 1 addition & 1 deletion lms/src/main/java/com/example/lms/domain/user/controller/UserControllerDocs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface UserControllerDocs {
})
ResponseEntity<?> delete(HttpServletRequest request);

@Operation(summary = "재발급 요청", description = "**성공 데이터:** 헤더의 `토큰` 및 쿠키," +
@Operation(summary = "재발급 요청", description = "**성공 데이터:** 헤더의 `토큰`" +
"무결성 침해 토큰으로 간주 시 `Refresh Token 초기화 진행 후 재로그인`을 유도합니다.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "재발급 성공"),
Expand Down
2 changes: 1 addition & 1 deletion lms/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spring:
port: ${REDIS_PORT:6379}
jpa:
hibernate:
ddl-auto: create
ddl-auto: none
default_batch_fetch_size: 1000
jdbc:
time_zone: Asia/Seoul
Expand Down
9 changes: 0 additions & 9 deletions lms/src/test/java/com/example/lms/domain/user/controller/UserControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,7 @@ void reissueToken() throws Exception {
when(tokenProvider.validateRefreshTokenWithAccessTokenInfo(ROLE_STUDENT, TEST_SUBJECT, requestRefreshToken)).thenReturn(true);

String newAccessToken = "newAccessToken";
String newRefreshToken = "newRefreshToken";
Mockito.when(tokenProvider.createAccessToken(eq(TEST_SUBJECT), eq(ROLE_STUDENT), any(Date.class))).thenReturn(newAccessToken);
Mockito.when(tokenProvider.createRefreshToken(eq(TEST_SUBJECT), eq(ROLE_STUDENT), any(Date.class))).thenReturn(newRefreshToken);
Mockito.when(tokenProvider.getRefreshTokenExpirationSeconds()).thenReturn(3600L);

// when
ResultActions actions = mockMvc.perform(
Expand All @@ -229,12 +226,6 @@ void reissueToken() throws Exception {
actions
.andExpect(status().isOk())
.andExpect(header().string(AUTHORIZATION_HEADER, newAccessToken))
.andExpect(header().exists(HttpHeaders.SET_COOKIE))
.andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("refresh_token=" + newRefreshToken)))
.andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("Path=/")))
.andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("Max-Age=" + 3600L)))
.andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("HttpOnly")))
.andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("SameSite=Strict")))
.andDo(print());
}

Expand Down
Loading