Merge Conflicts

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "cSpell.words": [
+        "Archivage",
+        "Choisir",
+        "effet"
+    ]
+}

app.env

@@ -0,0 +1,4 @@
+DB_URL=jdbc:mysql://suivie-physique-master.cbsqw4oegule.us-east-1.rds.amazonaws.com/sp
+MAIL_HOST=sandbox.smtp.mailtrap.io
+ACTIVE_PROFILE=dev
+JAR_VERSION=0.0.1

backend/pom.xml

@@ -39,15 +39,6 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.ldap</groupId>-->
-<!--			<artifactId>spring-ldap-core</artifactId>-->
-<!--		</dependency>-->
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.security</groupId>-->
-<!--			<artifactId>spring-security-ldap</artifactId>-->
-<!--		</dependency>-->
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>

backend/src/main/java/com/sp/auth/audit/ApplicationAuditAware.java → backend/src/main/java/com/sp/audit/ApplicationAuditAware.java

@@ -1,7 +1,7 @@
-package com.sp.auth.audit;
+package com.sp.audit;
 
 
-import com.sp.users.user.User;
+import com.sp.users.model.User;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;

backend/src/main/java/com/sp/auth/controller/AuthenticationController.java

@@ -1,9 +1,6 @@
 package com.sp.auth.controller;
 
-import com.sp.auth.schema.AuthenticationRequest;
-import com.sp.auth.schema.AuthenticationResponse;
-import com.sp.auth.schema.RegisterRequest;
-import com.sp.auth.schema.ResetPasswordRequest;
+import com.sp.auth.schema.*;
 import com.sp.auth.service.AuthenticationService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -19,6 +16,8 @@
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+
 @RestController
 @RequestMapping("/auth")
 @RequiredArgsConstructor
@@ -57,6 +56,12 @@ public ResponseEntity<AuthenticationResponse> authenticate(
     ) {
         return ResponseEntity.ok(service.authenticate(request));
     }
+    @PostMapping("/refresh-token")
+    public ResponseEntity<AuthenticationResponse> refreshToken(
+            @RequestBody @Valid RefreshTokenRequest request
+    ) throws IOException {
+        return ResponseEntity.ok(service.refreshToken(request));
+    }
 
     @GetMapping("/activate-account")
     public ResponseEntity<?> activateAccount(

backend/src/main/java/com/sp/auth/schema/AuthenticationResponse.java

@@ -1,10 +1,14 @@
 package com.sp.auth.schema;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 import lombok.Data;
 
 @Data
 @Builder
 public class AuthenticationResponse {
-    private String token;
+    @JsonProperty("access_token")
+    private String accessToken;
+    @JsonProperty("refresh_token")
+    private String refreshToken;
 }

backend/src/main/java/com/sp/auth/schema/RefreshTokenRequest.java

@@ -0,0 +1,12 @@
+package com.sp.auth.schema;
+
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class RefreshTokenRequest {
+    private String refreshToken;
+    private String accessToken;
+}

backend/src/main/java/com/sp/auth/service/AuthenticationService.java

@@ -1,15 +1,14 @@
 package com.sp.auth.service;
 
-import com.sp.auth.schema.AuthenticationRequest;
-import com.sp.auth.schema.AuthenticationResponse;
-import com.sp.auth.schema.RegisterRequest;
-import com.sp.auth.schema.ResetPasswordRequest;
-import com.sp.auth.token.*;
-import com.sp.users.role.Role;
-import com.sp.users.user.UserRepository;
-import com.sp.mail.config.EmailTemplateName;
+import com.sp.auth.schema.*;
+import com.sp.token.Token;
+import com.sp.token.TokenRepository;
+import com.sp.token.TokenType;
+import com.sp.users.model.Role;
+import com.sp.users.model.UserRepository;
+import com.sp.mail.config.*;
 import com.sp.mail.service.MailService;
-import com.sp.users.user.User;
+import com.sp.users.model.User;
 import jakarta.mail.MessagingException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,6 +17,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -70,6 +70,9 @@ public AuthenticationResponse authenticate(AuthenticationRequest request) {
 
         // Generate a new valid token
         var jwtToken = jwtService.generateToken(claims, user);
+        // Generate a new refresh token
+        var refreshToken = jwtService.generateRefreshToken(user);
+
         var token = Token.builder()
                 .token(jwtToken)
                 .tokenType(TokenType.BEARER)
@@ -85,7 +88,8 @@ public AuthenticationResponse authenticate(AuthenticationRequest request) {
         // Return the token
         return AuthenticationResponse
                 .builder()
-                .token(jwtToken)
+                .accessToken(jwtToken)
+                .refreshToken(refreshToken)
                 .build();
     }
 
@@ -109,7 +113,39 @@ public void activateAccount(String token) throws MessagingException {
         tokenRepository.save(activationTwoFactorToken);
     }
 
-
+    public AuthenticationResponse refreshToken(
+            RefreshTokenRequest request
+    ) throws IOException {
+
+        final String username;
+
+        username = jwtService.extractUsername(request.getRefreshToken());
+
+        if (username != null){
+            var user = this.userRepository.findByEmail(username)
+                    .orElseThrow(() -> new RuntimeException("User not found"));
+            if (jwtService.isTokenValid(request.getRefreshToken(), user)) {
+                var accessToken = jwtService.generateToken(user);
+                revokeAllUserTokens(user);
+                var token = Token.builder()
+                        .token(accessToken)
+                        .tokenType(TokenType.BEARER)
+                        .revoked(false)
+                        .expired(false)
+                        .createdAt(LocalDateTime.now())
+                        .validatedAt(LocalDateTime.now())
+                        .user(user)
+                        .build();
+                tokenRepository.save(token);
+                return AuthenticationResponse
+                        .builder()
+                        .accessToken(accessToken)
+                        .refreshToken(request.getRefreshToken())
+                        .build();
+            }
+        }
+        throw new RuntimeException("Refresh token is invalid");
+    }
 
     public void resetPassword(ResetPasswordRequest request) throws MessagingException {
       // Reset Password

backend/src/main/java/com/sp/auth/service/JwtService.java

@@ -27,13 +27,19 @@ public class JwtService {
     @Value("${application.security.jwt.secret}")
     private String secretKey = "secret";
 
+    @Value("${application.security.jwt.refresh-expiration}")
+    private long refreshExpiration;
+
     public String generateToken(UserDetails userDetails){
         return generateToken(new HashMap<>(), userDetails);
     }
 
     public String generateToken(Map<String, Object> claims, UserDetails userDetails){
         return buildToken(claims, userDetails, jwtExpiration);
     }
+    public String generateRefreshToken(UserDetails userDetails){
+        return buildToken(new HashMap<>(), userDetails, refreshExpiration);
+    }
 
     public String buildToken(Map<String, Object> claims, UserDetails userDetails, long expiration){
         var authorities = userDetails

backend/src/main/java/com/sp/auth/service/LogoutService.java

@@ -1,5 +1,5 @@
 package com.sp.auth.service;
-import com.sp.auth.token.TokenRepository;
+import com.sp.token.TokenRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;

backend/src/main/java/com/sp/auth/service/UserDetailsServiceImpl.java

@@ -1,6 +1,6 @@
 package com.sp.auth.service;
 
-import com.sp.users.user.UserRepository;
+import com.sp.users.model.UserRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;

backend/src/main/java/com/sp/config/BeansConfig.java

@@ -1,6 +1,6 @@
 package com.sp.config;
 
-import com.sp.auth.audit.ApplicationAuditAware;
+import com.sp.audit.ApplicationAuditAware;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -20,7 +20,6 @@
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.http.HttpHeaders;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

backend/src/main/java/com/sp/filter/JwtAuthenticationFilter.java

@@ -1,7 +1,7 @@
 package com.sp.filter;
 
 import com.sp.auth.service.JwtService;
-import com.sp.auth.token.TokenRepository;
+import com.sp.token.TokenRepository;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

backend/src/main/java/com/sp/gestion/archivage/controller/ArchiveController.java

@@ -0,0 +1,27 @@
+package com.sp.gestion.archivage.controller;
+
+
+import com.sp.gestion.archivage.schema.ArchiveResponse;
+import com.sp.gestion.archivage.service.ArchiveService;
+import lombok.RequiredArgsConstructor;
+import org.apache.coyote.Response;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/archive")
+@RequiredArgsConstructor
+public class ArchiveController {
+
+    private final ArchiveService archiveService;
+
+    @GetMapping("/all")
+    public ResponseEntity<List<ArchiveResponse>> getAllArchives() {
+        return ResponseEntity.ok(this.archiveService.getAllArchives());
+    }
+
+}

backend/src/main/java/com/sp/gestion/archivage/model/Archive.java

@@ -0,0 +1,61 @@
+package com.sp.gestion.archivage.model;
+
+
+import com.sp.gestion.suivie_physique.model.Valeur;
+import com.sp.users.model.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.GenericGenerator;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "_archive")
+@EntityListeners(AuditingEntityListener.class)
+public class Archive {
+    @Id
+    @GeneratedValue(strategy= GenerationType.AUTO,generator="native")
+    @GenericGenerator(name = "native",strategy = "native")
+    private Long id;
+
+    private LocalDateTime dateArchive;
+
+    @OneToMany(mappedBy = "archive", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Valeur> valeurs;
+
+
+    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private ArchiveType type;
+
+    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private User archivist;
+
+    @CreatedBy
+    @Column(name = "created_by", updatable = false)
+    private String createdBy;
+
+    @CreatedDate
+    @Column(name = "created_date", updatable = false)
+    private LocalDateTime createdDate;
+
+    @LastModifiedDate
+    @Column(name = "last_modified_date")
+    private LocalDateTime lastModifiedDate;
+
+    @LastModifiedBy
+    @Column(name = "last_modified_by")
+    private String lastModifiedBy;
+}

backend/src/main/java/com/sp/gestion/archivage/model/ArchiveRepository.java

@@ -0,0 +1,6 @@
+package com.sp.gestion.archivage.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ArchiveRepository extends JpaRepository<Archive, Long> {
+}