Skip to content
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

RefreshToken을 재발급 받을 때 현재 시간을 기준으로 발급 받도록 변경 #528

Merged
merged 5 commits into from
Sep 19, 2023
Merged

RefreshToken을 재발급 받을 때 현재 시간을 기준으로 발급 받도록 변경 #528

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
62373bf
refactor: RefreshToken과 AccessToken의 유효기간을 dev에서 변경
cookienc Sep 19, 2023
9e1550b
refactor: 쿠키 maxAge 설정 변경
cookienc Sep 19, 2023
e1e5f62
fix: between 날짜 시작과 끝 변경
cookienc Sep 19, 2023
a5d2247
Merge branch 'dev/BE' into feat/523
cookienc Sep 19, 2023
1fb7bae
refactor: 현재시간 기준으로 refreshToekn을 재발급 하도록 변경
cookienc Sep 19, 2023
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
4 changes: 2 additions & 2 deletions backend/baton/src/main/java/touch/baton/domain/oauth/token/ExpireDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ private void validateNotNull(final LocalDateTime value) {
}
}

public void plusMinutes(final int minutes) {
this.value = value.plusMinutes(minutes);
public void refreshExpireTokenDate(final int minutes) {
this.value = LocalDateTime.now().plusMinutes(minutes);
}

public boolean isExpired() {
Expand Down
2 changes: 1 addition & 1 deletion backend/baton/src/main/java/touch/baton/domain/oauth/token/RefreshToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private void validateNotNull(final Member member, final Token token, final Expir

public void updateToken(final Token token, final int expiredMinutes) {
this.token = token;
expireDate.plusMinutes(expiredMinutes);
expireDate.refreshExpireTokenDate(expiredMinutes);
}

public boolean isNotOwner(final Member member) {
Expand Down
5 changes: 3 additions & 2 deletions backend/baton/src/test/java/touch/baton/domain/oauth/token/RefreshTokenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.time.LocalDateTime;

import static java.time.LocalDateTime.now;
import static java.time.temporal.ChronoUnit.MINUTES;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down Expand Up @@ -99,8 +100,8 @@ void updateToken() {
// then
assertAll(
() -> assertThat(refreshToken.getToken()).isEqualTo(updateToken),
() -> assertThat(refreshToken.getExpireDate()).isEqualTo(new ExpireDate(currentTime.plusMinutes(30)))
);
() -> assertThat(refreshToken.getExpireDate().getValue().truncatedTo(MINUTES))
.isEqualTo((currentTime.plusMinutes(30)).truncatedTo(MINUTES)));
}

@DisplayName("토큰의 주인을 확인할 수 있다.")
Expand Down