diff --git a/src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java b/src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java index 107909c..1937276 100644 --- a/src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java +++ b/src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java @@ -26,18 +26,13 @@ } @GET - public Response getFriendRequests(@QueryParam("token") String token, @FormParam("userId") String userId) { + public Response getFriendRequests(@QueryParam("token") String token) { //400(不正なリクエスト) //トークンが空文字の時 if (token.isBlank()) { return Response.status(Response.Status.BAD_REQUEST).build(); } - //401(トークンが無効です) - if (!userRepository.checkToken(userId, token)) {//トークンが通らなかった時 - return Response.status(Response.Status.UNAUTHORIZED).build(); - } - // 200 ArrayList requests = friendService.getFriendRequests(token); return Response.status(Response.Status.OK).entity(requests).build(); @@ -59,17 +54,12 @@ @Path("/{friend-request-id}") @DELETE - public Response deleteFriendRequest(@PathParam("friend-request-id") Integer friendRequestId, @QueryParam("receiver-token") String receiverToken, @FormParam("userId") String userId) { + public Response deleteFriendRequest(@PathParam("friend-request-id") Integer friendRequestId, @QueryParam("receiver-token") String receiverToken) { //トークンが空文字の時 if (receiverToken.isBlank()) { return Response.status(Response.Status.BAD_REQUEST).build(); } - //401(トークンが無効です) - if (!userRepository.checkToken(userId, receiverToken)) {//トークンが通らなかった時 - return Response.status(Response.Status.UNAUTHORIZED).build(); - } - boolean isDeleted = friendService.removeFriendRequest(receiverToken, friendRequestId); if (isDeleted) { return Response.status(Response.Status.OK).build();