diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad299de..2fac53e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,10 @@
-
+
-
-
-
+
@@ -201,7 +199,15 @@
1740052413527
-
+
+
+ 1740056898416
+
+
+
+ 1740056898416
+
+
@@ -215,10 +221,10 @@
-
-
+
+
diff --git a/src/main/java/com/example/nto/controller/AuthController.java b/src/main/java/com/example/nto/controller/AuthController.java
index 8f77183..f08713a 100644
--- a/src/main/java/com/example/nto/controller/AuthController.java
+++ b/src/main/java/com/example/nto/controller/AuthController.java
@@ -25,9 +25,6 @@ import java.util.List;
@RestController
public class AuthController {
- @Autowired
- private PasswordEncoder passwordEncoder;
-
class RoleResponse {
private boolean isAdmin;
diff --git a/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java b/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java
index 00dffa0..d32f1cc 100644
--- a/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java
+++ b/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java
@@ -36,6 +36,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
return super.authenticationManagerBean();
}
+ /**
+ * Выгружаем всех юзеров из бд в оперативку, почему бы и нет
+ * @return
+ */
@Bean
@DependsOnDatabaseInitialization
public UserDetailsService userDetailsService() {
@@ -55,25 +59,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
return inMemoryUserDetailsManager;
}
- @Bean
- public BCryptPasswordEncoder passwordEncoder() {
- return new BCryptPasswordEncoder();
- }
-
- @Bean
- public DaoAuthenticationProvider authenticationProvider() {
- DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
- authProvider.setUserDetailsService(userDetailsService());
- authProvider.setPasswordEncoder(passwordEncoder());
-
- return authProvider;
- }
-
- @Override
- protected void configure(AuthenticationManagerBuilder auth) throws Exception {
- auth.authenticationProvider(authenticationProvider());
- }
-
@Override
protected void configure(HttpSecurity http) throws Exception {
http