contact controller improved

src/main/java/net/dancier/dancer/contact/ContactController.java

@@ -1,6 +1,8 @@
 package net.dancier.dancer.contact;
 
 import lombok.RequiredArgsConstructor;
+import net.dancier.dancer.security.AuthenticatedUser;
+import net.dancier.dancer.security.CurrentUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -11,6 +13,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.stream.Collectors;
+
 import static net.dancier.dancer.authentication.Constants.ROLE_HUMAN;
 
 @RestController
@@ -23,10 +27,12 @@ public class ContactController {
     private final ContactService contactService;
 
     @PostMapping
-    @Secured(ROLE_HUMAN)
-    public ResponseEntity sentMail(@RequestBody ContactDto contactDto) {
+    @Secured({ROLE_HUMAN})
+    public ResponseEntity sentMail(@RequestBody ContactDto contactDto,
+                                   @CurrentUser AuthenticatedUser currentUser) {
+
         log.info("Sending {} to {}.", contactDto.getMessage(), contactDto.getSender());
-        contactService.send(contactDto);
+        contactService.send(contactDto, currentUser);
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 

src/main/java/net/dancier/dancer/contact/ContactDto.java

@@ -9,7 +9,6 @@
 public class ContactDto {
 
     @Email
-    @NotNull
     private String sender;
 
     @NotNull

src/main/java/net/dancier/dancer/contact/ContactService.java

@@ -2,23 +2,36 @@
 
 import lombok.RequiredArgsConstructor;
 import net.dancier.dancer.mail.service.MailCreationService;
+import net.dancier.dancer.security.AuthenticatedUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.mail.SimpleMailMessage;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import static net.dancier.dancer.authentication.Constants.ROLE_USER;
 
 @Service
 @RequiredArgsConstructor
 public class ContactService {
 
+    private final static Logger log = LoggerFactory.getLogger(ContactService.class);
+
     private final MailCreationService mailCreationService;
 
     private final ApplicationEventPublisher applicationEventPublisher;
 
-    void send(ContactDto contactDto) {
+    void send(ContactDto contactDto, AuthenticatedUser authenticatedUserOfSender) {
+        String senderMailAddress = (authenticatedUserOfSender.getAuthorities().contains(ROLE_USER))
+                ? authenticatedUserOfSender.getEmail()
+                : contactDto.getSender();
         SimpleMailMessage mailToSender = mailCreationService.createDancierMessageFromTemplate(
-                contactDto.getSender(),
+                senderMailAddress,
                 "dev@dancier.net",
                 "Vielen Dank - Team Dancier",
                 MailCreationService.CONTACT_FORMULAR_FEEDBACK,
@@ -27,7 +40,7 @@ void send(ContactDto contactDto) {
 
         SimpleMailMessage mailToTeamDancier = mailCreationService.createDancierMessageFromTemplate(
                 "dev@dancier.net",
-                contactDto.getSender(),
+                senderMailAddress,
                 "Mail über das Kontakt formular",
                 MailCreationService.CONTACT_FORMULAR,
                 Map.of(

src/main/java/net/dancier/dancer/security/AuthenticatedUser.java

@@ -57,6 +57,10 @@ public UUID getUserId() {
         return userId;
     }
 
+    public String getEmail() {
+        return this.email;
+    }
+
     public boolean isEmailValidated() {
         return isEmailValidated;
     }