@cerema/cadriciel 1.4.26 → 1.4.29

package/aqtion/backend/aqtion-presentation/pom.xml

@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>fr.cerema.dsi</groupId>
-    <artifactId>aqtion</artifactId>
-    <version>0.0.1</version>
-  </parent>
-  <packaging>jar</packaging>
-  <artifactId>aqtion-presentation</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>org.hibernate.validator</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <version>8.0.1.Final</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-devtools</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aqtion-transverse</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aqtion-metier</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aqtion-data</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-oauth2-resource-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-oauth2-jose</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-impl</artifactId>
-      <version>0.11.5</version>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-jackson</artifactId>
-      <version>0.11.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-      <version>1.9.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>jacoco-maven-plugin</artifactId>
-      <version>0.8.7</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>aqtion_${project.version}</finalName>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources-filtered</directory>
-        <filtering>true</filtering>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>false</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-        <configuration>
-          <classesDirectory>${project.build.outputDirectory}</classesDirectory>
-          <runOrder>alphabetical</runOrder>
-          <includes>
-            <include>**/*IT*</include>
-            <include>**/*IntTest*</include>
-          </includes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <goal>integration-test</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>verify</id>
-            <goals>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.7</version>
-        <executions>
-          <execution>
-            <id>pre-unit-tests</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-unit-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>pre-integration-tests</id>
-            <goals>
-              <goal>prepare-agent-integration</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-integration-tests</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>report-integration</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/App.java

@@ -1,20 +0,0 @@
-package fr.cerema.dsi.aqtion;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackages = {"fr.cerema.dsi.commons", "fr.cerema.dsi.aqtion"})
-public class App {
-
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//        return application.sources(App.class);
-//    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(App.class, args);
-    }
-
-}
-
-

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/config/AspectJConfiguration.java

@@ -1,58 +0,0 @@
-package fr.cerema.dsi.aqtion.config;
-
-import fr.cerema.dsi.commons.exceptions.GenericServiceException;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.authentication.AuthenticationServiceException;
-import org.springframework.stereotype.Component;
-
-
-// TODO Voir au fur et a mesure de cet aspect
-
-@Component
-@Aspect
-public class AspectJConfiguration {
-
-    private static Logger logger = LoggerFactory.getLogger(AspectJConfiguration.class);
-
-
-    @Around("execution(* fr.cerema.dsi.commons.services.*Service+.*(..)) || " +
-            "execution(* fr.cerema.dsi.aqtion.services.*Service+.*(..)) ")
-    public Object executeService(final ProceedingJoinPoint joinPoint) throws Throwable {
-        Object returnValue = null;
-        logger.trace("Appel du service {}", joinPoint.getSignature().toShortString());
-        try {
-            returnValue = joinPoint.proceed();
-            logger.debug("Succès de l'appel à {}", joinPoint.getSignature().toShortString());
-        } catch (AuthenticationServiceException ase) {
-            logger.warn("Warn lors de l'appel au service d'authentification {}", joinPoint.getSignature().toShortString());
-            throw ase;
-        } catch (GenericServiceException gse) {
-            logger.warn("Warn lors de l'appel à {} : {}", joinPoint.getSignature().toShortString(), gse.getMessage());
-            throw gse;
-        } catch (RuntimeException rte) {
-            logger.error("Erreur lors de l'appel à {} : {}", joinPoint.getSignature().toShortString(), rte.getMessage());
-            throw rte;
-        }
-        return returnValue;
-    }
-
-
-    @Around("execution(* fr.cerema.dsi.commons.repositories.*Repository+.*(..)) || " +
-            "execution(* fr.cerema.dsi.aqtion.repositories.*Repository+.*(..))")
-    public Object executeRepository(final ProceedingJoinPoint joinPoint) throws Throwable {
-        logger.trace("Appel de {}", joinPoint.getSignature().toShortString());
-        try {
-            Object returnValue = joinPoint.proceed();
-            logger.debug("Succès de l'appel à {}", joinPoint.getSignature().toShortString());
-            return returnValue;
-        } catch (RuntimeException e) {
-            logger.error("L'appel à {} a provoqué une erreur : {}", joinPoint.getSignature().toShortString(), e.getMessage());
-            throw e;
-        }
-    }
-
-}

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/config/AuthenticationTokenFilter.java

@@ -1,134 +0,0 @@
-package fr.cerema.dsi.aqtion.config;
-
-import fr.cerema.dsi.commons.security.auth.jwt.exceptions.InvalidTokenException;
-import fr.cerema.dsi.aqtion.services.CustomUserDetailsService;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Header;
-import io.jsonwebtoken.Jwt;
-import io.jsonwebtoken.Jwts;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.lang.NonNull;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.core.env.Environment;
-
-import java.io.IOException;
-
-@Component
-public class AuthenticationTokenFilter extends OncePerRequestFilter {
-  @Autowired
-  private Environment env;
-
-  // Nommé différemment de "logger" car celui-ci existe déjà dans le GenericBeanFilter (JCL)
-  private static final Logger slfLogger = LoggerFactory.getLogger(AuthenticationTokenFilter.class);
-
-  private static final String JWT_EMAIL = "email";
-  private static final String JWT_ORIONID = "sub";
-  private static final String JWT_BEARER = "Bearer";
-  public static final String AUTHORIZATION_HEADER = "Authorization";
-
-  private static final String JWT_TYPE = "typ";
-
-  @Value("${info.app.issuer}")
-  private String urlSSO;
-
-  @Value("${info.app.audience}")
-  private String tokenAudience;
-
-
-  private final CustomUserDetailsService userDetailsService;
-
-  public AuthenticationTokenFilter(CustomUserDetailsService userDetailsService) {
-    this.userDetailsService = userDetailsService;
-  }
-
-
-  @Override
-  protected void doFilterInternal(HttpServletRequest request, @NonNull HttpServletResponse response,
-                                  @NonNull FilterChain filterChain) throws ServletException, IOException {
-    final String requestTokenHeader = request.getHeader(AUTHORIZATION_HEADER);
-    if (requestTokenHeader != null && !StringUtils.isEmpty(requestTokenHeader)) {
-      String jwtToken = this.resolveToken(requestTokenHeader);
-      if (jwtToken != null) {
-        String[] splitToken = jwtToken.split("\\.");
-        String unsignedToken = splitToken[0] + "." + splitToken[1] + ".";
-        Jwt<Header, Claims> jwsClaims = Jwts.parserBuilder().build().parseClaimsJwt(unsignedToken);
-        String username = (String) jwsClaims.getBody().get(JWT_EMAIL);
-        String orionId = (String) jwsClaims.getBody().get(JWT_ORIONID);
-
-        if (orionId != null && username != null) {
-          UserDetails userDetails = this.userDetailsService.loadAndMajInfoUser(orionId, username);
-          this.isValidToken(jwsClaims);
-          UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken =
-            new UsernamePasswordAuthenticationToken(
-              userDetails, null, userDetails.getAuthorities());
-          usernamePasswordAuthenticationToken
-            .setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-          SecurityContextHolder.getContext()
-            .setAuthentication(usernamePasswordAuthenticationToken);
-        }
-      }
-    }
-
-    filterChain.doFilter(request, response);
-  }
-
-  private String resolveToken(String requestTokenHeader) {
-    if (requestTokenHeader.startsWith(JWT_BEARER)) {
-      return requestTokenHeader.substring(7);
-    }
-    return null;
-  }
-
-
-  private void isValidToken(Jwt<Header, Claims> jwtToken) {
-    /*String devMode = env.getProperty("CADRICIEL_DEV");
-    this.checkType(jwtToken.getBody());
-    if (devMode == null || !devMode.equalsIgnoreCase("true")) {
-      this.checkIssuer(jwtToken.getBody());
-      this.checkAudience(jwtToken.getBody());
-    }*/
-  }
-
-  private void checkType(Claims jwsClaims) {
-    String type = jwsClaims.get(JWT_TYPE, String.class);
-
-    if (!StringUtils.equalsIgnoreCase(type, JWT_BEARER)) {
-      slfLogger.warn("Type non conforme, type: {}, attendu: {}", type, JWT_BEARER);
-      throw new InvalidTokenException("Le jeton d'authentification n'est pas du bon type.");
-    }
-  }
-
-  private void checkIssuer(Claims jwsClaims) {
-    String issuer = jwsClaims.getIssuer();
-
-    if (!StringUtils.equalsIgnoreCase(issuer, urlSSO)) {
-      slfLogger.warn("Issuer non conforme, issuer: {}, attendu: {}", issuer, urlSSO);
-      throw new InvalidTokenException(
-        "Le jeton d'authentification ne provient pas de la bonne source.");
-    }
-  }
-
-  private void checkAudience(Claims jwsClaims) {
-    String audience = jwsClaims.getAudience();
-
-    if (!StringUtils.containsAnyIgnoreCase(audience, tokenAudience)) {
-      slfLogger.warn(
-        "Audience non conforme, attendue: {}, fournie: {}", tokenAudience, audience);
-      throw new InvalidTokenException("Le jeton d'authentification ne nous est pas destiné.");
-    }
-  }
-
-}

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/config/SecurityConfiguration.java

@@ -1,80 +0,0 @@
-package fr.cerema.dsi.aqtion.config;
-
-import fr.cerema.dsi.commons.security.filters.AppCorsFilter;
-import fr.cerema.dsi.aqtion.services.CustomUserDetailsService;
-import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
-import io.swagger.v3.oas.annotations.security.OAuthFlow;
-import io.swagger.v3.oas.annotations.security.OAuthFlows;
-import io.swagger.v3.oas.annotations.security.SecurityScheme;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-
-import java.util.Arrays;
-import java.util.List;
-
-@Configuration
-@EnableWebSecurity
-@SecurityScheme(name = "ORION_AUTH", type = SecuritySchemeType.OAUTH2,
-        flows = @OAuthFlows(authorizationCode = @OAuthFlow(
-                authorizationUrl = "${springdoc.oAuthFlow.authorizationUrl}"
-                , tokenUrl = "${springdoc.oAuthFlow.tokenUrl}")))
-public class SecurityConfiguration {
-
-  @Autowired
-  private CustomUserDetailsService userDetailsService;
-
-  @Autowired
-  private AuthenticationTokenFilter authenticationTokenFilter;
-
-
-  @Bean
-  private static CorsConfigurationSource configurationSource() {
-    CorsConfiguration config = new CorsConfiguration();
-    config.setAllowedOriginPatterns(List.of("*"));
-    config.setAllowCredentials(true);
-    //config.addAllowedOriginPattern("*");
-    config.setAllowedHeaders(List.of("*"));
-    config.setMaxAge(36000L);
-    config.setAllowedMethods(Arrays.asList("GET", "HEAD", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-    UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-    source.registerCorsConfiguration("/**", config);
-    return source;
-  }
-
-  @Bean
-  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-    http.cors().configurationSource(configurationSource())
-      .and()
-      .csrf().disable()
-      .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-      .and()
-      .anonymous()
-      .and()
-      .authorizeHttpRequests()
-      .requestMatchers("/api/**").authenticated()
-      .requestMatchers("/**").permitAll()
-      .and()
-      .addFilterBefore(new AppCorsFilter(), UsernamePasswordAuthenticationFilter.class)
-      .oauth2ResourceServer()
-      .jwt();
-
-    return http.build();
-  }
-
-  @Autowired
-  public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(userDetailsService);
-  }
-}

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/config/StaticResourcesWebConfiguration.java

@@ -1,41 +0,0 @@
-package fr.cerema.dsi.aqtion.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class StaticResourcesWebConfiguration implements WebMvcConfigurer {
-
-  protected static final String[] RESOURCE_LOCATIONS = new String[]{
-    "classpath:/static/",
-    "classpath:/static/content/",
-    "classpath:/static/i18n/",
-  };
-  protected static final String[] RESOURCE_PATHS = new String[]{
-    "/*.js",
-    "/*.css",
-    "/*.svg",
-    "/*.png",
-    "*.ico",
-    "/content/**",
-    "/i18n/*",
-  };
-
-
-  @Override
-  public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    ResourceHandlerRegistration resourceHandlerRegistration = appendResourceHandler(registry);
-    initializeResourceHandler(resourceHandlerRegistration);
-  }
-
-  protected ResourceHandlerRegistration appendResourceHandler(ResourceHandlerRegistry registry) {
-    return registry.addResourceHandler(RESOURCE_PATHS);
-  }
-
-  protected void initializeResourceHandler(
-    ResourceHandlerRegistration resourceHandlerRegistration) {
-    resourceHandlerRegistration.addResourceLocations(RESOURCE_LOCATIONS);
-  }
-}

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/config/WebConfiguration.java

@@ -1,59 +0,0 @@
-package fr.cerema.dsi.aqtion.config;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.servers.Server;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-@EnableCaching
-public class WebConfiguration implements WebMvcConfigurer {
-
-  private static Logger logger = LoggerFactory.getLogger(WebConfiguration.class);
-
-  @Value("${url.externe:}")
-  private String urlExterne;
-
-  @Value("${info.app.version:unknown}")
-  private String version;
-
-  @Override
-  public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-
-    logger.info("Initialisation de la configuration de la négociation de contenu.");
-
-    configurer.
-      favorParameter(true).
-      parameterName("mediaType").
-      ignoreAcceptHeader(false).
-      defaultContentType(MediaType.APPLICATION_JSON).
-      mediaType("xml", MediaType.APPLICATION_XML).
-      mediaType("json", MediaType.APPLICATION_JSON);
-  }
-
-  @Bean
-  public OpenAPI infoOpenAPI() {
-    OpenAPI openAPI = new OpenAPI()
-      .info(new Info().title("aqtion")
-        .description("<b>Réalisez quelque chose d'exceptionnel</b>.")
-        .version(version)
-        .license(new License().name("Cecill 2.0")
-          .url("http://www.cecill.info/licences/Licence_CeCILL_V2-fr.html")));
-
-    if (StringUtils.isNotBlank(urlExterne)) {
-      openAPI.addServersItem(new Server().url(urlExterne));
-    }
-    return openAPI;
-  }
-
-}

package/aqtion/backend/aqtion-presentation/src/main/java/fr/cerema/dsi/aqtion/controllers/AccountController.java

@@ -1,64 +0,0 @@
-package fr.cerema.dsi.aqtion.controllers;
-
-import fr.cerema.dsi.aqtion.dto.UserWithCurrentAuthorityDTO;
-import fr.cerema.dsi.aqtion.entities.User;
-import fr.cerema.dsi.aqtion.mapper.UserMapper;
-import fr.cerema.dsi.aqtion.services.ProfilService;
-import fr.cerema.dsi.aqtion.services.UserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
-
-import java.util.Optional;
-
-@Tag(name = "Account", description = "Permet d'interroger le niveau d'authorisation des utilisateurs")
-@RestController
-@RequestMapping("/api")
-@CrossOrigin
-@SecurityRequirement(name = "ORION_AUTH")
-public class AccountController {
-
-  private final UserService userService;
-  private final ProfilService profilService;
-  private final UserMapper userMapper;
-
-  public AccountController(UserService userService, UserMapper userMapper, ProfilService profilService) {
-    this.userService = userService;
-    this.userMapper = userMapper;
-    this.profilService = profilService;
-  }
-
-
-  @Operation(summary = "Récupère l'utilisateur actuellement connecté")
-  @ApiResponses(value = {
-    @ApiResponse(responseCode = "200", description = "L'utilisateur connecté", content = {
-      @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-        schema = @Schema(implementation = UserWithCurrentAuthorityDTO.class)
-      )
-    }),
-    @ApiResponse(responseCode = "404", description = "L'utilisateur n'existe pas dans l'application", content = @Content)
-  })
-  @GetMapping("/user")
-  
-  public ResponseEntity<UserWithCurrentAuthorityDTO> getCurrentUser() {
-    Optional<User> userOptional = this.userService.getCurrentUser();
-    if (userOptional.isPresent()) {
-      // Utilisation de ProfilService avec le UserMapper
-      return new ResponseEntity<>(userMapper.toDtoWithCurrentAuthority(userOptional.get()), HttpStatus.OK);
-    }
-    throw new ResponseStatusException(HttpStatus.NOT_FOUND,
-      "L'utilisateur n'existe pas dans l'application");
-  }
-}