@@ -350,7 +350,7 @@ public class ApiController {
|
|||||||
@PathVariable(required = false) Integer version,
|
@PathVariable(required = false) Integer version,
|
||||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
try {
|
try {
|
||||||
if (tokenHeader == null) {
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
@@ -378,8 +378,8 @@ public class ApiController {
|
|||||||
errorData.put("file_status", entityResponse.getStatus());
|
errorData.put("file_status", entityResponse.getStatus());
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
MessageCode.FILE_DELETE.getCode(),
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
MessageCode.FILE_DELETE.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -388,14 +388,13 @@ public class ApiController {
|
|||||||
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
MessageCode.FILE_NOT_EXIST.getCode(),
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
MessageCode.FILE_NOT_EXIST.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
||||||
// Resource resource = new UrlResource(filePath.toUri());
|
|
||||||
FileSystemResource resource = new FileSystemResource(filePath);
|
FileSystemResource resource = new FileSystemResource(filePath);
|
||||||
long fileSize = Files.size(filePath);
|
long fileSize = Files.size(filePath);
|
||||||
|
|
||||||
@@ -408,7 +407,7 @@ public class ApiController {
|
|||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
String contentType = determineContentType(filePath);
|
String contentType = determineContentType(filePath);
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
return ResponseEntity.ok()
|
||||||
.contentLength(fileSize)
|
.contentLength(fileSize)
|
||||||
@@ -424,7 +423,15 @@ public class ApiController {
|
|||||||
MessageCode.FILE_NOT_FOUND.getCode(),
|
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
MessageCode.FILE_NOT_FOUND.getDescription(),
|
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
} catch (NotFoundAuthToken | IOException e) {
|
} catch (NotFoundAuthToken e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
||||||
|
errorData));
|
||||||
|
} catch (IOException e) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
errorData.put("fileId", fileId);
|
errorData.put("fileId", fileId);
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ public enum MessageCode {
|
|||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
|
FILE_NOT_EXIST(2, "File not exist on disk"),
|
||||||
|
FILE_DELETE(2, "File was deleted"),
|
||||||
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
|
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
|
||||||
USER_NOT_VERIFIED(2, "User not verified"),
|
USER_NOT_VERIFIED(2, "User not verified"),
|
||||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
||||||
|
|||||||
Reference in New Issue
Block a user