@@ -19,12 +19,11 @@ import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||
import ru.soune.nocopy.dto.file.UploadProgress;
|
||||
import ru.soune.nocopy.entity.AuthToken;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||
import ru.soune.nocopy.exception.*;
|
||||
import ru.soune.nocopy.handler.*;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.service.auth.AuthService;
|
||||
import ru.soune.nocopy.service.file.FileEntityService;
|
||||
import ru.soune.nocopy.service.file.FileUploadService;
|
||||
|
||||
@@ -48,7 +47,7 @@ public class ApiController {
|
||||
|
||||
private final FileEntityService fileEntityService;
|
||||
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
private final AuthService authService;
|
||||
|
||||
@PostMapping("/v{version}/data")
|
||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||
@@ -71,6 +70,9 @@ public class ApiController {
|
||||
return ResponseEntity.ok().body(response);
|
||||
} catch (ValidationException e) {
|
||||
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
|
||||
} catch (NotValidFieldException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
@@ -257,7 +259,7 @@ public class ApiController {
|
||||
errorData));
|
||||
}
|
||||
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||
|
||||
if (!entityResponse.getUserId().equals(userId)) {
|
||||
@@ -379,11 +381,4 @@ public class ApiController {
|
||||
mimeType.startsWith("video") ||
|
||||
mimeType.startsWith("audio");
|
||||
}
|
||||
|
||||
private Long getUserIdFromToken(String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
||||
return authToken.getUser().getId();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user