Skip to content

Commit 917965b

Browse files
committed
Fix: import 경로 및 테스트 코드 수정 + /admin 403 반환 문제 해결
1 parent 2589f5c commit 917965b

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

src/main/java/com/back/domain/chat/room/controller/RoomChatWebSocketController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import com.back.domain.studyroom.entity.RoomChatMessage;
66
import com.back.domain.chat.room.dto.RoomChatMessageDto;
77
import com.back.global.exception.CustomException;
8-
import com.back.global.exception.ErrorCode;
9-
import com.back.global.security.CustomUserDetails;
10-
import com.back.global.websocket.dto.WebSocketErrorResponse;
8+
import com.back.global.security.user.CustomUserDetails;
119
import com.back.domain.chat.room.service.RoomChatService;
1210
import com.back.global.websocket.util.WebSocketErrorHelper;
1311
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/back/global/exception/GlobalExceptionHandler.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.back.global.common.dto.RsData;
44
import org.springframework.http.HttpStatus;
55
import org.springframework.http.ResponseEntity;
6+
import org.springframework.security.access.AccessDeniedException;
7+
import org.springframework.security.authorization.AuthorizationDeniedException;
68
import org.springframework.web.bind.MethodArgumentNotValidException;
79
import org.springframework.web.bind.annotation.ExceptionHandler;
810
import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -41,6 +43,13 @@ public ResponseEntity<RsData<Void>> handleSecurityException(SecurityException ex
4143
.body(RsData.fail(ErrorCode.FORBIDDEN));
4244
}
4345

46+
@ExceptionHandler({AuthorizationDeniedException.class, AccessDeniedException.class})
47+
public ResponseEntity<RsData<Void>> handleAccessDenied(Exception ex) {
48+
return ResponseEntity
49+
.status(HttpStatus.FORBIDDEN)
50+
.body(RsData.fail(ErrorCode.FORBIDDEN));
51+
}
52+
4453
@ExceptionHandler(Exception.class)
4554
public ResponseEntity<RsData<Void>> handleGenericException(Exception ex) {
4655
return ResponseEntity

src/test/java/com/back/domain/chat/room/controller/RoomChatApiControllerTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.back.domain.chat.room.service.RoomChatService;
66
import com.back.global.exception.CustomException;
77
import com.back.global.exception.ErrorCode;
8-
import com.back.global.security.CustomUserDetails;
9-
import com.back.global.security.JwtTokenProvider;
8+
import com.back.global.security.jwt.JwtTokenProvider;
9+
import com.back.global.security.user.CustomUserDetails;
1010
import org.junit.jupiter.api.DisplayName;
1111
import org.junit.jupiter.api.Test;
1212

@@ -64,7 +64,7 @@ void t1() throws Exception {
6464
.willReturn(mockResponse);
6565

6666
// JWT 관련 스텁
67-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
67+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
6868

6969
CustomUserDetails mockUser = CustomUserDetails.builder()
7070
.userId(1L)
@@ -124,7 +124,7 @@ void t3() throws Exception {
124124
@Test
125125
@DisplayName("잘못된 JWT 토큰으로 요청 - 401 Unauthorized")
126126
void t4() throws Exception {
127-
given(jwtTokenProvider.validateToken("invalidtoken")).willReturn(false);
127+
given(jwtTokenProvider.validateAccessToken("invalidtoken")).willReturn(false);
128128
129129
mockMvc.perform(get("/api/rooms/1/messages")
130130
.param("page", "0")
@@ -174,7 +174,7 @@ void t6() throws Exception {
174174
given(roomChatService.clearRoomChat(roomId, userId)).willReturn(clearedByInfo);
175175

176176
// JWT 관련 스텁
177-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
177+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
178178

179179
CustomUserDetails mockUser = CustomUserDetails.builder()
180180
.userId(userId)
@@ -228,7 +228,7 @@ void t7() throws Exception {
228228
given(roomChatService.clearRoomChat(roomId, userId)).willReturn(clearedByInfo);
229229

230230
// JWT 관련 스텁
231-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
231+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
232232

233233
CustomUserDetails mockUser = CustomUserDetails.builder()
234234
.userId(userId)
@@ -266,7 +266,7 @@ void t8() throws Exception {
266266
.given(roomChatService).clearRoomChat(roomId, userId);
267267

268268
// JWT 관련 스텁
269-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
269+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
270270

271271
CustomUserDetails mockUser = CustomUserDetails.builder()
272272
.userId(userId)
@@ -303,7 +303,7 @@ void t9() throws Exception {
303303
willThrow(new CustomException(ErrorCode.ROOM_NOT_FOUND))
304304
.given(roomChatService).clearRoomChat(nonExistentRoomId, userId);
305305

306-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
306+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
307307

308308
CustomUserDetails mockUser = CustomUserDetails.builder()
309309
.userId(userId)
@@ -340,7 +340,7 @@ void t10() throws Exception {
340340
willThrow(new CustomException(ErrorCode.INVALID_DELETE_CONFIRMATION))
341341
.given(roomChatService).clearRoomChat(roomId, userId);
342342

343-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
343+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
344344

345345
CustomUserDetails mockUser = CustomUserDetails.builder()
346346
.userId(userId)
@@ -374,7 +374,7 @@ void t11() throws Exception {
374374
Long roomId = 1L;
375375

376376
// JWT 관련 스텁
377-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
377+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
378378

379379
CustomUserDetails mockUser = CustomUserDetails.builder()
380380
.userId(1L)
@@ -410,7 +410,7 @@ void t12() throws Exception {
410410
willThrow(new CustomException(ErrorCode.NOT_ROOM_MEMBER))
411411
.given(roomChatService).clearRoomChat(roomId, userId);
412412

413-
given(jwtTokenProvider.validateToken("faketoken")).willReturn(true);
413+
given(jwtTokenProvider.validateAccessToken("faketoken")).willReturn(true);
414414

415415
CustomUserDetails mockUser = CustomUserDetails.builder()
416416
.userId(userId)

src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.back.domain.user.entity.UserProfile;
1010
import com.back.global.exception.CustomException;
1111
import com.back.global.exception.ErrorCode;
12-
import com.back.global.security.CustomUserDetails;
12+
import com.back.global.security.user.CustomUserDetails;
1313
import com.back.global.websocket.util.WebSocketErrorHelper;
1414
import org.junit.jupiter.api.BeforeEach;
1515
import org.junit.jupiter.api.DisplayName;

0 commit comments

Comments
 (0)