Skip to content

Commit 183592e

Browse files
committed
refactor(token): 토큰 타입 명명 수정
1 parent 2607bc6 commit 183592e

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

src/main/java/com/somemore/global/auth/cookie/CookieService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void setToken(HttpServletResponse response, String value, TokenType token
2020

2121
@Override
2222
public void deleteAccessToken(HttpServletResponse response) {
23-
ResponseCookie cookie = generateCookie(TokenType.SIGNOUT, TokenType.SIGNOUT.name());
23+
ResponseCookie cookie = generateCookie(TokenType.SIGN_OUT, TokenType.SIGN_OUT.name());
2424
response.addHeader("Set-Cookie", cookie.toString());
2525
}
2626

src/main/java/com/somemore/global/auth/jwt/domain/TokenType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
public enum TokenType {
99
ACCESS(Duration.ofMinutes(30)),
1010
REFRESH(Duration.ofDays(7)),
11-
LOGIN(Duration.ofMinutes(1)),
12-
SIGNOUT(Duration.ZERO);
11+
SIGN_IN(Duration.ofMinutes(1)),
12+
SIGN_OUT(Duration.ZERO);
1313

1414
private final Duration period;
1515

src/main/java/com/somemore/global/auth/jwt/service/GenerateTokensOnLoginService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class GenerateTokensOnLoginService implements GenerateTokensOnLoginUseCas
2525

2626
@Override
2727
public EncodedToken generateLoginToken(UUID userId, UserRole role) {
28-
return generateToken(userId, role, TokenType.LOGIN);
28+
return generateToken(userId, role, TokenType.SIGN_IN);
2929
}
3030

3131
@Override

src/main/java/com/somemore/global/auth/oauth/handler/CustomOAuthSuccessHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private void processAccessToken(HttpServletResponse response, UUID userId) {
5555
generateTokensOnLoginUseCase.generateLoginToken(
5656
userId, UserRole.getOAuthUserDefaultRole());
5757

58-
cookieUseCase.setToken(response, loginToken.getValueWithPrefix(), TokenType.LOGIN);
58+
cookieUseCase.setToken(response, loginToken.getValueWithPrefix(), TokenType.SIGN_IN);
5959
}
6060

6161
private OAuth2User extractOAuthUser(Authentication authentication) {

src/test/java/com/somemore/domains/volunteer/service/SignOutVolunteerServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void signOutDeletesTokens() {
7676
.isInstanceOf(JwtException.class)
7777
.hasMessage(JwtErrorType.EXPIRED_TOKEN.getMessage());
7878

79-
assertThat(Arrays.toString(response.getCookies())).contains(TokenType.SIGNOUT.name());
79+
assertThat(Arrays.toString(response.getCookies())).contains(TokenType.SIGN_OUT.name());
8080
}
8181

8282
@Test
@@ -87,6 +87,6 @@ void signOutWithoutRefreshToken() {
8787

8888
// Then
8989
assertThatNoException().isThrownBy(() -> signOutVolunteerService.signOut(response, volunteerId));
90-
assertThat(Arrays.toString(response.getCookies())).contains(TokenType.SIGNOUT.name());
90+
assertThat(Arrays.toString(response.getCookies())).contains(TokenType.SIGN_OUT.name());
9191
}
9292
}

src/test/java/com/somemore/global/auth/cookie/CookieServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void deleteAccessToken_ShouldRemoveCookie() {
3737

3838
// Then
3939
String setCookieHeader = response.getHeader("Set-Cookie");
40-
assertThat(setCookieHeader).contains("ACCESS_TOKEN=" + TokenType.SIGNOUT.name()); // 빈 값
40+
assertThat(setCookieHeader).contains("ACCESS_TOKEN=" + TokenType.SIGN_OUT.name()); // 빈 값
4141
assertThat(setCookieHeader).contains("Max-Age=0"); // 삭제
4242
assertThat(setCookieHeader).contains("Path=/");
4343
}

0 commit comments

Comments
 (0)