WildCodeSchool
diff --git a/‎pom.xml‎
Lines changed: 19 additions & 0 deletions b/‎pom.xml‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎src/main/java/com/back_alasso/BackendProjectTemplateApplication.java‎
Lines changed: 13 additions & 0 deletions b/‎src/main/java/com/back_alasso/BackendProjectTemplateApplication.java‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/main/java/com/back_alasso/features/Activity/DTO/ActivitySaveRequestDTO.java‎
Lines changed: 3 additions & 1 deletion b/‎src/main/java/com/back_alasso/features/Activity/DTO/ActivitySaveRequestDTO.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/main/java/com/back_alasso/features/Authentication/AuthController.java‎
Lines changed: 12 additions & 1 deletion b/‎src/main/java/com/back_alasso/features/Authentication/AuthController.java‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎src/main/java/com/back_alasso/features/Authentication/ValidationConstants.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/back_alasso/features/Authentication/ValidationConstants.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/back_alasso/features/Image/ImageService.java‎
Lines changed: 42 additions & 6 deletions b/‎src/main/java/com/back_alasso/features/Image/ImageService.java‎
Lines changed: 42 additions & 6 deletions
diff --git a/‎src/main/java/com/back_alasso/security/JwtAuthenticationFilter.java‎
Lines changed: 1 addition & 6 deletions b/‎src/main/java/com/back_alasso/security/JwtAuthenticationFilter.java‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎src/main/java/com/back_alasso/security/SecurityConstants.java‎
Lines changed: 3 additions & 2 deletions b/‎src/main/java/com/back_alasso/security/SecurityConstants.java‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/test/java/com/back_alasso/integration/User/UserServiceIntegrationTest.java‎
Lines changed: 1 addition & 1 deletion b/‎src/test/java/com/back_alasso/integration/User/UserServiceIntegrationTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -135,6 +135,25 @@
             <artifactId>jjwt-impl</artifactId>
             <version>0.11.5</version>
         </dependency>
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.20</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.15.0</version>
+        </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
 
@@ -1,16 +1,21 @@
 package com.back_alasso;
 
 import com.back_alasso.config.InitLogger;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 public class BackendProjectTemplateApplication {
 
+  private final int ONE_HUNDRED_THOUSAND = 100_000_000;
+
   public static void main(String[] args) {
+    System.setProperty("spring.jackson.parser.allow-unquoted-field-names", "true");
     ApplicationContext context = SpringApplication.run(BackendProjectTemplateApplication.class, args);
     InitLogger logger = new InitLogger();
     logger.logCurrentEnvironment(context);
@@ -20,4 +25,12 @@ public static void main(String[] args) {
   public RestTemplate restTemplate() {
     return new RestTemplate();
   }
+
+  @Bean
+  public Jackson2ObjectMapperBuilderCustomizer jacksonCustomizer() {
+    return builder ->
+      builder.postConfigurer(mapper ->
+        mapper.getFactory().setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(ONE_HUNDRED_THOUSAND).build())
+      );
+  }
 }
@@ -5,6 +5,7 @@
 import com.back_alasso.features.Image.DTO.ImageActivityCreationRequestDTO;
 import com.back_alasso.features.Theme.ThemeNameEnumType;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -31,7 +32,8 @@ public class ActivitySaveRequestDTO {
   @NotBlank(groups = OnPublish.class)
   private String title;
 
-  @NotNull(groups = OnPublish.class)
+  @NotNull(groups = OnPublish.class, message = "Le nombre de volontaires est obligatoire")
+  @Min(value = 1, message = "Le nombre de volontaires doit être supérieur à 0")
   private Long requestedVolunteers;
 
   @NotNull(groups = OnPublish.class)
 
@@ -17,6 +17,7 @@
 import jakarta.validation.Validator;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -39,6 +40,16 @@ public class AuthController {
   private final AssociationLoginResponseMapper associationLoginResponseMapper;
   private final LoginRateLimitFilter loginRateLimitFilter;
 
+  @GetMapping("/token")
+  public ResponseEntity<Map<String, Object>> getUserByToken(@AuthenticationPrincipal UserDetails userDetails) {
+    UUID authenticatedUserId = userService.getAuthenticatedUserId(userDetails);
+    User user = userService.findById(authenticatedUserId);
+
+    Map<String, Object> response = new HashMap<>();
+    authService.addUserToResponse(user, response);
+    return ResponseEntity.ok(response);
+  }
+
   @PostMapping("/register/voluntary")
   public ResponseEntity<Boolean> register(@Valid @RequestBody VoluntaryRegistrationDTO voluntaryRegistrationDTO) {
     userService.checkUserExists(voluntaryRegistrationDTO.email());
@@ -48,7 +59,7 @@ public ResponseEntity<Boolean> register(@Valid @RequestBody VoluntaryRegistratio
   }
 
   @PostMapping("/register/association")
-  public ResponseEntity<Boolean> register(@RequestBody AssociationRegistrationDTO associationRegistrationDTO) {
+  public ResponseEntity<Boolean> register(@Valid @RequestBody AssociationRegistrationDTO associationRegistrationDTO) {
     validator.validate(associationRegistrationDTO, OnPublish.class);
 
     userService.checkUserExists(associationRegistrationDTO.email());
 
@@ -7,5 +7,5 @@ public class ValidationConstants {
   public static final int MIN_PASSWORD_LENGTH = 8;
   public static final String SIRET_REGEX = "^\\d{14}$";
   public static final String PASSWORD_REGEX = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*()_\\-+=\\[\\]{};':\"\\\\|,.<>/?]).{8,}$";
-  public static final String PHONE_REGEX = "^(\\+33|0)[1-9](\\d{2}){4}$";
+  public static final String PHONE_REGEX = "^(|(?:\\+33|0)[1-9](\\d{2}){4})$";
 }
@@ -2,13 +2,18 @@
 
 import com.back_alasso.exception.ResourceNotFoundException;
 import com.back_alasso.features.Image.DTO.ImageActivityCreationRequestDTO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import javax.imageio.ImageIO;
 import lombok.RequiredArgsConstructor;
+import net.coobird.thumbnailator.Thumbnails;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -18,6 +23,27 @@
 public class ImageService {
 
   private final ImageRepository imageRepository;
+  private final double ZERO_POINT_SIX = 0.6;
+  private final double ONE = 1.0;
+
+  private byte[] compressImage(byte[] originalBytes, double targetQuality, double scale) throws IOException {
+    ByteArrayInputStream inputStream = new ByteArrayInputStream(originalBytes);
+    BufferedImage originalImage = ImageIO.read(inputStream);
+
+    if (originalImage == null) {
+      throw new IOException("Impossible de lire l'image");
+    }
+
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+    Thumbnails.of(originalImage)
+      .scale(scale) // ex: 1.0 garde la taille, <1.0 réduit
+      .outputQuality(targetQuality) // qualité JPEG/WebP (0.0 à 1.0)
+      .outputFormat("jpeg")
+      .toOutputStream(outputStream);
+
+    return outputStream.toByteArray();
+  }
 
   public List<Image> processImages(List<ImageActivityCreationRequestDTO> imageDTOs) {
     if (imageDTOs == null || imageDTOs.isEmpty()) return Collections.emptyList();
@@ -36,11 +62,17 @@ public List<Image> processImages(List<ImageActivityCreationRequestDTO> imageDTOs
         }
         byte[] imageData = Base64.getDecoder().decode(base64);
 
-        Image image = new Image();
-        image.setData(imageData);
-        image.setType(ImageEnumType.ACTIVITY);
-        image.setUrl("");
-        newImages.add(image);
+        try {
+          byte[] compressed = compressImage(imageData, ZERO_POINT_SIX, ONE);
+
+          Image image = new Image();
+          image.setData(compressed);
+          image.setType(ImageEnumType.ACTIVITY);
+          image.setUrl("");
+          newImages.add(image);
+        } catch (IOException e) {
+          throw new RuntimeException("Erreur lors de la compression de l'image", e);
+        }
       }
     }
 
@@ -56,12 +88,16 @@ public Image uploadImage(MultipartFile file, ImageEnumType type, String folder)
 
       validateExtension(extension);
 
+      byte[] originalData = file.getBytes();
+
+      byte[] compressedData = compressImage(originalData, ZERO_POINT_SIX, ONE);
+
       String cleanedFilename = cleanFilename(originalFilename != null ? originalFilename : type.name().toLowerCase());
       String uniqueFilename = UUID.randomUUID() + "_" + cleanedFilename;
       String url = "/images/" + folder + "/" + uniqueFilename;
 
       Image image = new Image();
-      image.setData(file.getBytes());
+      image.setData(compressedData);
       image.setType(type);
       image.setFilename(uniqueFilename);
       image.setFormat(extension);
 
@@ -33,12 +33,7 @@ public JwtAuthenticationFilter(JwtService jwtService, UserDetailsService userDet
   @Override
   protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
     throws ServletException, IOException {
-    if (isPublicUrl(request) && parseJwt(request) == null) {
-      filterChain.doFilter(request, response);
-      return;
-    }
-
-    if (!authenticateRequest(request, response)) {
+    if (!isPublicUrl(request) && !authenticateRequest(request, response)) {
       return;
     }
 
 
@@ -6,10 +6,11 @@ public class SecurityConstants {
 
   public static final Set<String> PUBLIC_URLS = new HashSet<>(
     Arrays.asList(
-      "/auth/**",
+      "auth/register/**",
+      "auth/login",
       "/reset-password/**",
       "/themes",
-      "/activities",
+      "/activities/future",
       "/activities/{id}",
       "/association/{id}",
       "/images/**",
 
@@ -75,7 +75,7 @@ class UserServiceIntegrationTest extends AbstractTests {
     private PreferencesRepository preferencesRepository;
 
     @MockitoBean
-    private GeolocationService geolocationService; // Mock du service externe
+    private GeolocationService geolocationService;
 
     @BeforeEach
     void setup() {
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ public class ValidationConstants {`
`7`	`7`	`public static final int MIN_PASSWORD_LENGTH = 8;`
`8`	`8`	`public static final String SIRET_REGEX = "^\\d{14}$";`
`9`	`9`	`public static final String PASSWORD_REGEX = "^(?=.[a-z])(?=.[A-Z])(?=.\\d)(?=.[!@#$%^&*()_\\-+=\\[\\]{};':\"\\\\\|,.<>/?]).{8,}$";`
`10`		`- public static final String PHONE_REGEX = "^(\\+33\|0)[1-9](\\d{2}){4}$";`
	`10`	`+ public static final String PHONE_REGEX = "^(\|(?:\\+33\|0)[1-9](\\d{2}){4})$";`
`11`	`11`	`}`