Correctifs pour IUT

pom.xml

@@ -6,7 +6,7 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>3.2.3</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath/> 
 	</parent>
 	<groupId>fr.but.infoetu</groupId>
 	<artifactId>meetingplannr</artifactId>

src/main/java/fr/but/infoetu/meetingplannr/controller/ImageController.java

+package fr.but.infoetu.meetingplannr.controller;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/images")
+public class ImageController {
+
+    private final String UPLOAD_DIR = "src/main/resources/static/uploads/";
+
+    @GetMapping("/{filename}")
+    public ResponseEntity<byte[]> getImage(@PathVariable String filename) {
+        try {
+            Path imagePath = Paths.get(UPLOAD_DIR, filename);
+            byte[] imageBytes = Files.readAllBytes(imagePath);
+
+            String mimeType = Files.probeContentType(imagePath);
+
+            return ResponseEntity.ok()
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "inline;filename=\"" + filename + "\"")
+                    .contentType(MediaType.parseMediaType(mimeType))
+                    .body(imageBytes);
+
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+        }
+    }
+}
+

src/main/java/fr/but/infoetu/MeetingPlannr/controller/UserController.java → src/main/java/fr/but/infoetu/meetingplannr/controller/UserController.java

@@ -31,6 +31,7 @@ import fr.but.infoetu.meetingplannr.repository.MeetingRepository;
 import fr.but.infoetu.meetingplannr.repository.RequestRepository;
 import fr.but.infoetu.meetingplannr.repository.UserRepository;
 import fr.but.infoetu.meetingplannr.service.UserService;
+import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 
@@ -62,8 +63,8 @@ public class UserController {
         if (details == null) {
             return "redirect:/public/login";
         }
+        System.out.println(details);
         User user = ur.findByUsername(details.getUsername()).get();
-        System.out.println(user);
         model.addAttribute("currentUser", user);
         return "user/profile";
     }

src/main/java/fr/but/infoetu/MeetingPlannr/pojo/User.java → src/main/java/fr/but/infoetu/meetingplannr/pojo/User.java

@@ -78,7 +78,7 @@ public class User implements UserDetails {
     private String photoPath;
 
     public String getPhotoUrl() {
-        return photoPath != null ? "/uploads/" + photoPath : "/uploads/avatar.png";
+        return photoPath != null ? "/images/" + photoPath : "/images/avatar.png";
     }
 
     @Override

src/main/java/fr/but/infoetu/MeetingPlannr/service/UserService.java → src/main/java/fr/but/infoetu/meetingplannr/service/UserService.java

@@ -46,7 +46,8 @@ public class UserService {
                 helper.setFrom("paul.cancel.etu@univ-lille.fr");
                 helper.setTo(user.getUsername());
                 helper.setSubject("Compte banni");
-                helper.setText("Votre compte : " + user.getUsername() + " a été banni le " + java.time.LocalDate.now());
+                helper.setText("Votre compte : " + user.getUsername() + " a été banni le " + java.time.LocalDate.now() + "\n"
+                        + "Vous ne pourrez plus vous connecter à MeetingPlannr à partir de maintenant.");
                 sender.send(message);
             } catch (jakarta.mail.MessagingException e) {
                 throw new RuntimeException("Erreur lors de l'envoi de l'email", e);

src/main/resources/application.properties

@@ -3,9 +3,13 @@ spring.mvc.view.prefix=/WEB-INF/jsp/
 spring.mvc.view.suffix=.jsp
 
 spring.datasource.driverClassName=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5432/but3
-spring.datasource.username=postgres
-spring.datasource.password=admin
+# spring.datasource.url=jdbc:postgresql://localhost:5432/but3
+# spring.datasource.username=postgres
+# spring.datasource.password=admin
+spring.datasource.url=jdbc:postgresql://psqlserv/but3
+spring.datasource.username=paulcanceletu
+spring.datasource.password=moi
+
 
 spring.jpa.hibernate.ddl-auto=create-drop