From 72e7af7a357686472d5d2ea37bedb31faad9405e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= <hello@beatrice.wtf>
Date: Wed, 7 Aug 2024 21:29:10 +0200
Subject: [PATCH] improve code quality

---
 .../config/SecurityConfiguration.java         | 21 +++++++++++--------
 .../service/AccountServiceImpl.java           |  4 ----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/wtf/beatrice/releasehive/config/SecurityConfiguration.java b/src/main/java/wtf/beatrice/releasehive/config/SecurityConfiguration.java
index ffb6c12..02b8870 100644
--- a/src/main/java/wtf/beatrice/releasehive/config/SecurityConfiguration.java
+++ b/src/main/java/wtf/beatrice/releasehive/config/SecurityConfiguration.java
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
@@ -34,18 +35,20 @@ public class SecurityConfiguration
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        http.csrf()
-                .disable()
-                .authorizeHttpRequests()
+
+        http.csrf(AbstractHttpConfigurer::disable);
+
+        http.authorizeHttpRequests(authorizationManagerRequestMatcherRegistry -> authorizationManagerRequestMatcherRegistry
                 .requestMatchers("/api/v1/auth/**")
                 .permitAll()
                 .anyRequest()
-                .authenticated()
-                .and()
-                .sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                .authenticationProvider(authenticationProvider)
+                .authenticated());
+
+        http.sessionManagement(httpSecuritySessionManagementConfigurer -> {
+            httpSecuritySessionManagementConfigurer.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+        });
+
+        http.authenticationProvider(authenticationProvider)
                 .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
 
         return http.build();
diff --git a/src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java b/src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java
index 6fe138e..5e187a1 100644
--- a/src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java
+++ b/src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java
@@ -1,18 +1,14 @@
 package wtf.beatrice.releasehive.service;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
-import wtf.beatrice.releasehive.db.HibernateManager;
 import wtf.beatrice.releasehive.dto.LoginUserDto;
 import wtf.beatrice.releasehive.dto.RegisterUserDto;
 import wtf.beatrice.releasehive.model.User;
 import wtf.beatrice.releasehive.repository.UserRepository;
-import wtf.beatrice.releasehive.util.JsonUtil;
 
 @Service
 public class AccountServiceImpl implements AccountService {