NCBACK-27 #12
@@ -17,7 +17,8 @@ public class HandlerConfig {
|
|||||||
FileUploadHandler upload,
|
FileUploadHandler upload,
|
||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler,
|
LogoutRequestHandler logoutHandler,
|
||||||
ImageFoundRequestHandler imageFoundRequestHandler
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
|
AuthRequestHandler authRequestHandler
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -26,6 +27,7 @@ public class HandlerConfig {
|
|||||||
map.put(20005, file);
|
map.put(20005, file);
|
||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
map.put(20007, imageFoundRequestHandler);
|
map.put(20007, imageFoundRequestHandler);
|
||||||
|
map.put(20008, authRequestHandler);
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,12 +19,11 @@ import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
|||||||
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
||||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||||
import ru.soune.nocopy.dto.file.UploadProgress;
|
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.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
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.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
@@ -48,7 +47,7 @@ public class ApiController {
|
|||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthService authService;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@@ -71,6 +70,9 @@ public class ApiController {
|
|||||||
return ResponseEntity.ok().body(response);
|
return ResponseEntity.ok().body(response);
|
||||||
} catch (ValidationException e) {
|
} catch (ValidationException e) {
|
||||||
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
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) {
|
} catch (NotValidFieldException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -257,7 +259,7 @@ public class ApiController {
|
|||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
|
||||||
if (!entityResponse.getUserId().equals(userId)) {
|
if (!entityResponse.getUserId().equals(userId)) {
|
||||||
@@ -368,10 +370,15 @@ public class ApiController {
|
|||||||
return contentType;
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Long getUserIdFromToken(String tokenHeader) {
|
private boolean isPreviewSupported(String mimeType) {
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
if (mimeType == null) {
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
return false;
|
||||||
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
}
|
||||||
return authToken.getUser().getId();
|
|
||||||
|
return mimeType.startsWith("image") ||
|
||||||
|
mimeType.startsWith("text") ||
|
||||||
|
mimeType.equals("pdf") ||
|
||||||
|
mimeType.startsWith("video") ||
|
||||||
|
mimeType.startsWith("audio");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -19,6 +19,7 @@ public enum MessageCode {
|
|||||||
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
||||||
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
||||||
|
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
||||||
FILE_NOT_FOUND(4, "File not found"),
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TokenProcessRequest {
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -30,7 +30,7 @@ public class AuthToken {
|
|||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
@Column(name = "expires_at", nullable = false)
|
@Column(name = "expires_at", nullable = false)
|
||||||
private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
|
private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
|
||||||
|
|
||||||
@CreatedDate
|
@CreatedDate
|
||||||
@Column(name = "created_at", updatable = false, nullable = false)
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
@@ -41,8 +41,4 @@ public class AuthToken {
|
|||||||
|
|
||||||
@Column(name = "is_active")
|
@Column(name = "is_active")
|
||||||
private Boolean isActive = true;
|
private Boolean isActive = true;
|
||||||
|
|
||||||
public boolean isValid() {
|
|
||||||
return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.TokenProcessRequest;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class AuthRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws NotFoundAuthToken {
|
||||||
|
TokenProcessRequest tokenProcessRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||||
|
TokenProcessRequest.class);
|
||||||
|
|
||||||
|
authService.useUserAuthToken(tokenProcessRequest.getToken());
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
"Token processed successfully",
|
||||||
|
Map.of("token", tokenProcessRequest.getToken()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,13 +6,12 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileStatsService;
|
import ru.soune.nocopy.service.file.FileStatsService;
|
||||||
|
|
||||||
@@ -26,9 +25,9 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
private final FileStatsService fileStatsService;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final FileStatsService fileStatsService;
|
||||||
|
|
||||||
private final ObjectMapper objectMapper;
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
@@ -81,7 +80,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
|
FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(),
|
return new BaseResponse(request.getMsgId(),
|
||||||
@@ -92,7 +91,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
if (!fileInfo.getUserId().equals(userId)) {
|
||||||
@@ -123,7 +122,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
|
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
|
||||||
request.getVersion());
|
request.getVersion());
|
||||||
|
|
||||||
@@ -155,7 +154,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||||
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||||
|
|
||||||
@@ -182,7 +181,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||||
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||||
|
|
||||||
@@ -229,7 +228,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
long usage = fileEntityService.getUserStorageUsed(userId);
|
long usage = fileEntityService.getUserStorageUsed(userId);
|
||||||
|
|
||||||
StorageUsageResponse response = StorageUsageResponse.builder()
|
StorageUsageResponse response = StorageUsageResponse.builder()
|
||||||
@@ -259,7 +258,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
String fileId = fileRequest.getFileId();
|
String fileId = fileRequest.getFileId();
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
|
FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
|
||||||
DeleteFileResponse response;
|
DeleteFileResponse response;
|
||||||
@@ -306,20 +305,6 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Long getUserIdFromToken(String token) {
|
|
||||||
if (token == null || token.isBlank()) {
|
|
||||||
throw new NotFoundAuthToken("Token is required");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (token.startsWith("Bearer ")) {
|
|
||||||
token = token.replace("Bearer ", "");
|
|
||||||
}
|
|
||||||
|
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
|
||||||
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
|
||||||
return authToken.getUser().getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String formatFileSize(long size) {
|
private String formatFileSize(long size) {
|
||||||
if (size < 1024) return size + " B";
|
if (size < 1024) return size + " B";
|
||||||
int exp = (int) (Math.log(size) / Math.log(1024));
|
int exp = (int) (Math.log(size) / Math.log(1024));
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import ru.soune.nocopy.exception.*;
|
|||||||
import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
|
import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -28,6 +29,8 @@ import java.util.stream.Collectors;
|
|||||||
public class FileUploadHandler implements RequestHandler {
|
public class FileUploadHandler implements RequestHandler {
|
||||||
private final FileUploadService fileUploadService;
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
private final FileUploadSessionRepository fileUploadSessionRepository;
|
private final FileUploadSessionRepository fileUploadSessionRepository;
|
||||||
@@ -86,8 +89,7 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
|
MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
|
||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
Long userId = authService.useUserAuthToken(token);
|
||||||
|
|
||||||
BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
|
BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
|
||||||
fileUploadRequestValidator.validate(fileRequest, bindingResult);
|
fileUploadRequestValidator.validate(fileRequest, bindingResult);
|
||||||
|
|
||||||
@@ -105,7 +107,7 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FileUploadSession session = fileUploadService.initUpload(
|
FileUploadSession session = fileUploadService.initUpload(
|
||||||
authToken.getUser().getId(),
|
userId,
|
||||||
fileRequest.getFileName(),
|
fileRequest.getFileName(),
|
||||||
fileRequest.getFileType(),
|
fileRequest.getFileType(),
|
||||||
fileRequest.getExtension(),
|
fileRequest.getExtension(),
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import ru.soune.nocopy.dto.*;
|
|||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -17,7 +17,9 @@ import java.util.Map;
|
|||||||
public class LoginRequestHandler implements RequestHandler {
|
public class LoginRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
private final AuthService authService;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final ObjectMapper objectMapper;
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -34,9 +36,12 @@ public class LoginRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.login(loginRequest);
|
AuthToken authToken = authService.login(loginRequest);
|
||||||
|
String token = authToken.getToken();
|
||||||
|
|
||||||
LoginAnswer loginAnswer = new LoginAnswer();
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
loginAnswer.setToken(authToken.getToken());
|
loginAnswer.setToken(token);
|
||||||
|
|
||||||
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import ru.soune.nocopy.entity.User;
|
|||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import ru.soune.nocopy.exception.NotValidFieldException;
|
|||||||
import ru.soune.nocopy.exception.ValidationException;
|
import ru.soune.nocopy.exception.ValidationException;
|
||||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -52,9 +52,11 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.register(regRequest);
|
AuthToken authToken = authService.register(regRequest);
|
||||||
|
String token = authToken.getToken();
|
||||||
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
RegAnswer regAnswer = new RegAnswer();
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
regAnswer.setToken(authToken.getToken());
|
regAnswer.setToken(token);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), regAnswer);
|
MessageCode.SUCCESS.getDescription(), regAnswer);
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
|
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
|
||||||
Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
|
List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
|
||||||
|
Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
|
||||||
Optional<AuthToken> findByToken(String token);
|
Optional<AuthToken> findByToken(String token);
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-4
@@ -1,13 +1,13 @@
|
|||||||
package ru.soune.nocopy.service;
|
package ru.soune.nocopy.service.auth;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.context.MessageSource;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
@@ -29,8 +29,6 @@ public class AuthService {
|
|||||||
|
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
private final MessageSource messageSource;
|
|
||||||
|
|
||||||
private final SecureRandom secureRandom = new SecureRandom();
|
private final SecureRandom secureRandom = new SecureRandom();
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@@ -81,6 +79,26 @@ public class AuthService {
|
|||||||
return authTokenRepository.save(authToken);
|
return authTokenRepository.save(authToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Long useUserAuthToken(String token) {
|
||||||
|
if (token == null || token.isBlank()) {
|
||||||
|
throw new NotFoundAuthToken("Token is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token.startsWith("Bearer ")) {
|
||||||
|
token = token.replace("Bearer ", "");
|
||||||
|
}
|
||||||
|
|
||||||
|
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||||
|
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
||||||
|
authToken.setLastUsedAt(LocalDateTime.now());
|
||||||
|
authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
|
||||||
|
|
||||||
|
authTokenRepository.save(authToken);
|
||||||
|
|
||||||
|
return authToken.getUser().getId();
|
||||||
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void logout(String token) {
|
public void logout(String token) {
|
||||||
authTokenRepository.findByToken(token)
|
authTokenRepository.findByToken(token)
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package ru.soune.nocopy.service.auth;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class CleanupTokenSessionsService {
|
||||||
|
@Autowired
|
||||||
|
private AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
@Value("${file.storage.auth-token-life-hours}")
|
||||||
|
private int authTokenLife;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Scheduled(fixedDelay = 30000)
|
||||||
|
public void cleanupExpiredTokens() {
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
|
List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
|
||||||
|
|
||||||
|
if (!expiredTokens.isEmpty()) {
|
||||||
|
authTokenRepository.deleteAll(expiredTokens);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,6 +29,7 @@ file:
|
|||||||
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
||||||
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
||||||
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
||||||
|
auth-token-life-hours: ${AUTH_TOKEN_LIFE:1} # 1 час
|
||||||
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
||||||
|
|
||||||
security:
|
security:
|
||||||
|
|||||||
@@ -1,101 +0,0 @@
|
|||||||
package ru.soune.nocopy.service;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.mockito.ArgumentCaptor;
|
|
||||||
import org.mockito.InjectMocks;
|
|
||||||
import org.mockito.Mock;
|
|
||||||
import org.mockito.MockitoAnnotations;
|
|
||||||
import org.springframework.context.MessageSource;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
||||||
import ru.soune.nocopy.dto.LoginRequest;
|
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
import ru.soune.nocopy.exception.NotValidationPasswordException;
|
|
||||||
import ru.soune.nocopy.exception.UserNotFoundException;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
public class AuthServiceTest {
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private UserRepository userRepository;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private PasswordEncoder passwordEncoder;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private MessageSource messageSource;
|
|
||||||
|
|
||||||
@InjectMocks
|
|
||||||
private AuthService authService;
|
|
||||||
|
|
||||||
@BeforeEach
|
|
||||||
void setUp() {
|
|
||||||
MockitoAnnotations.openMocks(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void login_success() {
|
|
||||||
LoginRequest request = new LoginRequest("test@mail.com", "password");
|
|
||||||
|
|
||||||
User user = new User();
|
|
||||||
user.setId(1L);
|
|
||||||
user.setEmail("test@mail.com");
|
|
||||||
user.setPassword("encoded_pass");
|
|
||||||
|
|
||||||
when(userRepository.findByEmail("test@mail.com"))
|
|
||||||
.thenReturn(Optional.of(user));
|
|
||||||
when(passwordEncoder.matches("password", "encoded_pass"))
|
|
||||||
.thenReturn(true);
|
|
||||||
when(authTokenRepository.save(any(AuthToken.class)))
|
|
||||||
.thenAnswer(invocation -> invocation.getArgument(0));
|
|
||||||
|
|
||||||
AuthToken token = authService.login(request);
|
|
||||||
|
|
||||||
assertNotNull(token);
|
|
||||||
assertNotNull(token.getToken());
|
|
||||||
// assertEquals(user.getTokens().get(0), token.getUser());
|
|
||||||
|
|
||||||
ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
|
|
||||||
verify(authTokenRepository).save(captor.capture());
|
|
||||||
|
|
||||||
// assertEquals(user, captor.getValue().getUser());
|
|
||||||
assertNotNull(captor.getValue().getToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void login_userNotFound() {
|
|
||||||
LoginRequest request = new LoginRequest("missing@mail.com", "pwd");
|
|
||||||
|
|
||||||
when(userRepository.findByEmail("missing@mail.com")).thenReturn(Optional.empty());
|
|
||||||
|
|
||||||
assertThrows(UserNotFoundException.class, () -> authService.login(request));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void login_invalidPassword() {
|
|
||||||
LoginRequest request = new LoginRequest("test@mail.com", "wrong");
|
|
||||||
|
|
||||||
User user = new User();
|
|
||||||
user.setEmail("test@mail.com");
|
|
||||||
user.setPassword("encoded_pass");
|
|
||||||
|
|
||||||
when(userRepository.findByEmail("test@mail.com")).thenReturn(Optional.of(user));
|
|
||||||
when(passwordEncoder.matches("wrong", "encoded_pass")).thenReturn(false);
|
|
||||||
|
|
||||||
assertThrows(NotValidationPasswordException.class, () -> authService.login(request));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user