diff --git a/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java b/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java index 4141b7725..f76c116ba 100644 --- a/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java +++ b/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java @@ -77,26 +77,32 @@ public class UserRoleVerification { public void validateRoleAndThrow(BaseRequest req) throws ValidationException { Objects.requireNonNull(roleForVerification); Long requesterId = req.getUserId(); - if (requesterId != null && !userHasRole(requesterId, roleForVerification)) { - log.trace("User {} has no role to allow this action", requesterId); - throw new ValidationException(roleVerificationError); - } else { + if (requesterId == null) { log.trace("Request without userId"); + } else { + if (!userHasRole(requesterId, roleForVerification)) { + log.trace("User {} has no role to allow this action", requesterId); + throw new ValidationException(roleVerificationError); + } } } public RequestInfoUpdate validateRoleAndGetResult(BaseRequest req) { Objects.requireNonNull(roleForVerification); Long requesterId = req.getUserId(); - if (requesterId != null && !userHasRole(requesterId, roleForVerification)) { - String errMsg = messageResolver.resolve(new EnumMessage(roleVerificationError, requesterId)); - log.info("User {} has no role: {}", requesterId, errMsg); - return new RequestInfoUpdate() - .setId(req.getId()) - .setStatus(ru.spcex.clearing.platform.messaging.service.Status.Error) - .setMessage(errMsg); - } else { + if (requesterId == null) { log.debug("Request without userId"); + } else { + if (!userHasRole(requesterId, roleForVerification)) { + String errMsg = messageResolver.resolve(new EnumMessage(roleVerificationError, requesterId)); + log.info("User {} has no role: {}", requesterId, errMsg); + return new RequestInfoUpdate() + .setId(req.getId()) + .setStatus(ru.spcex.clearing.platform.messaging.service.Status.Error) + .setMessage(errMsg); + } else { + log.trace("Request validateRoleAndGetResult for userId={} success", requesterId); + } } return null; }