Changed path

ita-social-projects · Jun 9, 2022 · 54f7264 · 54f7264
1 parent 3218e9f
commit 54f7264
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/core/src/main/java/greencity/converters/UserArgumentResolver.java b/core/src/main/java/greencity/converters/UserArgumentResolver.java
@@ -3,6 +3,8 @@
 import greencity.annotations.CurrentUserUuid;
 import greencity.client.UserRemoteClient;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.MethodParameter;
@@ -16,6 +18,7 @@
 
 @Component
 @AllArgsConstructor
+@Slf4j
 public class UserArgumentResolver implements HandlerMethodArgumentResolver {
     @Lazy
     @Autowired
@@ -38,6 +41,8 @@ public boolean supportsParameter(MethodParameter parameter) {
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
         NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
         Principal principal = webRequest.getUserPrincipal();
+        log.warn("Principal: {}", webRequest.getUserPrincipal().toString());
+        log.warn("NativeWebRequest: {}", webRequest);
         return principal != null ? userRemoteClient.findUuidByEmail(principal.getName()) : null;
     }
 }
diff --git a/core/src/main/java/greencity/security/filters/AccessTokenAuthenticationFilter.java b/core/src/main/java/greencity/security/filters/AccessTokenAuthenticationFilter.java
@@ -67,6 +67,8 @@ public void doFilterInternal(@SuppressWarnings("NullableProblems") HttpServletRe
                     .authenticate(new UsernamePasswordAuthenticationToken(token, null));
                 Optional<UserVO> user =
                     userRemoteClient.findNotDeactivatedByEmail((String) authentication.getPrincipal());
+                log.warn("Authentication: {}", authentication);
+                log.warn("UserVO: {}", user);
                 if (user.isPresent()) {
                     log.debug("User successfully authenticate - {}", authentication.getPrincipal());
                     SecurityContextHolder.getContext().setAuthentication(authentication);

diff --git a/service-api/src/main/java/greencity/client/config/UserRemoteClientInterceptor.java b/service-api/src/main/java/greencity/client/config/UserRemoteClientInterceptor.java
@@ -5,6 +5,8 @@
 import greencity.client.UserRemoteClient;
 import greencity.security.JwtTool;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -18,6 +20,7 @@
  */
 @RequiredArgsConstructor
 @Component
+@Slf4j
 public class UserRemoteClientInterceptor implements RequestInterceptor {
     private final JwtTool jwtTool;
     @Value("${greencity.authorization.service-email}")
@@ -39,6 +42,9 @@ public void apply(RequestTemplate template) {
             ? servletRequestAttributes.getRequest().getHeader(AUTHORIZATION_HEADER)
             : createAccessTokenForService();
 
+        log.warn("RequestContextHolder: {}", RequestContextHolder.getRequestAttributes().toString());
+        log.warn("Header: {}", servletRequestAttributes.getRequest().getHeader(AUTHORIZATION_HEADER));
+
         template.header(AUTHORIZATION_HEADER, accessToken);
     }