diff --git a/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java b/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java index cf0cc06..c016ec6 100644 --- a/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java +++ b/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.List; import static jakarta.ws.rs.core.Response.status; @@ -45,7 +46,7 @@ //200(成功レスポンス) - ArrayList requests = chatRequestRepository.getChatRequestsForUser(userId);//前の人がListだったらArrayListになるから作ってて頼む時はListで頼め + List requests = chatRequestRepository.getChatRequestsForUser(userId);//前の人がListだったらArrayListになるから作ってて頼む時はListで頼め //tokenのチェックはこっちでする、ほかのひとがしていた // 岩谷さんのUserRepositoryでtokenの確認を行う if (!userRepository.checkToken(userId, token) ) { @@ -91,19 +92,25 @@ @Path("/chat-requests/{chat-request-id}") @DELETE public Response deleteChatRequest( - @QueryParam("receiver-token") String receiverToken, + @QueryParam("token") String token, @PathParam("chat-request-id") Integer chatRequestId) { //401承認が必要です - if (receiverToken == null || receiverToken.isEmpty()) { + if (token == null || token.isEmpty()) { return status(Response.Status.UNAUTHORIZED) .entity("認証が必要です") // 401 .build(); } //403(未認証&トークンの不一致) - //ChatRequestRepository.getChatRequest(chatRequestId); - if (!userRepository.checkToken(null, null) && !userRepository.checkToken(null, null)) { + ChatRequest chatRequest = chatRequestRepository.getChatRequest(chatRequestId); + if (chatRequest == null) { + return Response.status(Response.Status.NOT_FOUND).build(); + } + String senderId = chatRequest.getSenderId(); + String receiverId = chatRequest.getReceiverId(); + + if (!userRepository.checkToken(senderId, token) && !userRepository.checkToken(receiverId, token)) { return Response.status(Response.Status.UNAUTHORIZED).build(); }