Spring Boot 3

1 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/com/juick/service/security/HTTPSignatureAuthenticationFilter.java b/src/main/java/com/juick/service/security/HTTPSignatureAuthenticationFilter.java
index 4eeb41b4..723cf576 100644
--- a/src/main/java/com/juick/service/security/HTTPSignatureAuthenticationFilter.java
+++ b/src/main/java/com/juick/service/security/HTTPSignatureAuthenticationFilter.java
@@ -28,11 +28,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.annotation.Nonnull;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -43,15 +42,16 @@ public class HTTPSignatureAuthenticationFilter extends OncePerRequestFilter {
     private final SignatureManager signatureManager;
     private final UserService userService;
 
-
     public HTTPSignatureAuthenticationFilter(
             final SignatureManager signatureManager,
             final UserService userService) {
         this.signatureManager = signatureManager;
         this.userService = userService;
     }
+
     @Override
-    protected void doFilterInternal(@Nonnull HttpServletRequest request, @Nonnull HttpServletResponse response, @Nonnull FilterChain filterChain) throws IOException, ServletException {
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws IOException, ServletException {
         if (authenticationIsRequired()) {
             Map<String, String> headers = Collections.list(request.getHeaderNames())
                     .stream()
@@ -63,7 +63,8 @@ public class HTTPSignatureAuthenticationFilter extends OncePerRequestFilter {
                     if (userUri.length() == 0) {
                         User userWithPassword = userService.getUserByName(user.getName());
                         userWithPassword.setAuthHash(userService.getHashByUID(userWithPassword.getUid()));
-                        Authentication authentication = new UsernamePasswordAuthenticationToken(userWithPassword.getName(), userWithPassword.getCredentials());
+                        Authentication authentication = new UsernamePasswordAuthenticationToken(
+                                new JuickUser(user), userWithPassword.getCredentials(), JuickUser.USER_AUTHORITY);
                         SecurityContextHolder.getContext().setAuthentication(authentication);
                     } else {
                         Authentication authentication = new AnonymousAuthenticationToken(userUri,