FEAT: deleteRoom endpoint and ResponseEntity usage
This commit is contained in:
16
src/main/java/com/mallardromain/hotel/config/AppConfig.java
Normal file
16
src/main/java/com/mallardromain/hotel/config/AppConfig.java
Normal file
@@ -0,0 +1,16 @@
|
||||
package com.mallardromain.hotel.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
||||
@Configuration
|
||||
public class AppConfig {
|
||||
|
||||
// By putting this here, UserService can grab it WITHOUT triggering SecurityConfig!
|
||||
@Bean
|
||||
public PasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
}
|
||||
}
|
||||
@@ -18,9 +18,12 @@ public class DatabaseSeeder {
|
||||
if (userRepository.count() == 0) {
|
||||
User testUser1 = new User("test1", passwordEncoder.encode("password1"));
|
||||
User testUser2 = new User("test2", passwordEncoder.encode("password2"));
|
||||
|
||||
User adminUser1 = new User("admin1", passwordEncoder.encode("password1"));
|
||||
adminUser1.setRole("ADMIN");
|
||||
|
||||
userRepository.save(testUser1);
|
||||
userRepository.save(testUser2);
|
||||
userRepository.save(adminUser1);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import org.springframework.security.authentication.AuthenticationManager;
|
||||
import org.springframework.security.authentication.ProviderManager;
|
||||
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
|
||||
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
|
||||
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.config.http.SessionCreationPolicy;
|
||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||
@@ -17,7 +18,9 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
|
||||
import com.mallardromain.hotel.security.JWTFilter;
|
||||
|
||||
@Configuration
|
||||
@EnableMethodSecurity
|
||||
public class SecurityConfig {
|
||||
|
||||
private final JWTFilter jwtFilter;
|
||||
|
||||
public SecurityConfig(JWTFilter jwtFilter) {
|
||||
@@ -46,12 +49,6 @@ public class SecurityConfig {
|
||||
return http.build();
|
||||
}
|
||||
|
||||
|
||||
@Bean
|
||||
public PasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public AuthenticationManager authenticationManager(
|
||||
AuthenticationConfiguration config,
|
||||
|
||||
Reference in New Issue
Block a user