Merge pull request #58 from dancier/upgrade-boot

human bla
dancier · Jan 14, 2024 · 0061f7b · 0061f7b
2 parents 70ef8f6 + 26a6896
commit 0061f7b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/net/dancier/dancer/contact/ContactController.java b/src/main/java/net/dancier/dancer/contact/ContactController.java
@@ -30,7 +30,6 @@ public class ContactController {
     @Secured({ROLE_HUMAN})
     public ResponseEntity sentMail(@RequestBody ContactDto contactDto,
                                    @CurrentUser AuthenticatedUser currentUser) {
-
         log.info("Sending {} to {}.", contactDto.getMessage(), contactDto.getSender());
         contactService.send(contactDto, currentUser);
         return ResponseEntity.status(HttpStatus.CREATED).build();

diff --git a/src/main/java/net/dancier/dancer/contact/ContactService.java b/src/main/java/net/dancier/dancer/contact/ContactService.java
@@ -27,7 +27,7 @@ public class ContactService {
     private final ApplicationEventPublisher applicationEventPublisher;
 
     void send(ContactDto contactDto, AuthenticatedUser authenticatedUserOfSender) {
-        String senderMailAddress = (authenticatedUserOfSender.getAuthorities().contains(ROLE_USER))
+        String senderMailAddress = authenticatedUserOfSender.getAuthorities().contains(ROLE_USER)
                 ? authenticatedUserOfSender.getEmail()
                 : contactDto.getSender();
         SimpleMailMessage mailToSender = mailCreationService.createDancierMessageFromTemplate(

diff --git a/src/main/java/net/dancier/dancer/security/AuthenticatedUser.java b/src/main/java/net/dancier/dancer/security/AuthenticatedUser.java
@@ -16,6 +16,7 @@ public class AuthenticatedUser implements UserDetails {
     private UUID userId;
 
     private Optional<UUID> optionalDancerId = Optional.empty();
+
     private String email;
 
     private String password;

diff --git a/src/main/java/net/dancier/dancer/security/JwtAuthenticationFilter.java b/src/main/java/net/dancier/dancer/security/JwtAuthenticationFilter.java
@@ -55,6 +55,19 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
     }
 
     private Authentication onlyCaptchaVerified() {
+
+        SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority("ROLE_HUMAN");
+        List<GrantedAuthority> authorities =  List.of(simpleGrantedAuthority);
+        AuthenticatedUser authenticatedUser = new AuthenticatedUser(
+                null,
+                null,
+                true,
+                null,
+                Optional.empty(),
+                authorities
+        );
+
+
         Authentication authentication = new Authentication() {
             @Override
             public Collection<? extends GrantedAuthority> getAuthorities() {
@@ -74,7 +87,7 @@ public Object getDetails() {
 
             @Override
             public Object getPrincipal() {
-                return null;
+                return authenticatedUser;
             }
 
             @Override