Skip to content

Commit da19b8e

Browse files
authored
merge: pull request #103 from fix/login/1
fix: 로그인 에러 수정 #102
2 parents bdc74cb + 98b05f1 commit da19b8e

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

chat/src/main/java/org/example/soundlinkchat_java/global/config/SecurityConfig.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,26 @@
88
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
99
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
1010
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
11+
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
1112
import org.springframework.security.web.SecurityFilterChain;
1213
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
1314

1415
@Configuration
1516
@EnableWebSecurity
1617
@RequiredArgsConstructor
18+
@SuppressWarnings("squid:S4502")
1719
public class SecurityConfig {
18-
1920
private final JwtProvider jwtProvider;
2021

2122
@Bean
22-
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
23+
public BCryptPasswordEncoder passwordEncoder() {
24+
return new BCryptPasswordEncoder();
25+
}
26+
27+
@Bean
28+
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{
2329
http
30+
.csrf(AbstractHttpConfigurer::disable)
2431
.authorizeHttpRequests(auth -> auth
2532
// .requestMatchers("/api/**").permitAll()
2633
// .requestMatchers("/swagger-ui/**").permitAll()
@@ -32,7 +39,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
3239
// JwtAuthenticationFilter 추가
3340
.addFilterBefore(new JwtAuthenticationFilter(jwtProvider), UsernamePasswordAuthenticationFilter.class);
3441

35-
3642
return http.build();
3743
}
38-
}
44+
}

default/src/main/java/org/dfbf/soundlink/global/config/SecurityConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.dfbf.soundlink.global.config;
22

3+
import jakarta.servlet.ServletRequest;
34
import lombok.RequiredArgsConstructor;
45
import org.dfbf.soundlink.global.auth.JwtAuthenticationFilter;
56
import org.dfbf.soundlink.global.auth.JwtProvider;
@@ -16,6 +17,7 @@
1617
@Configuration
1718
@EnableWebSecurity
1819
@RequiredArgsConstructor
20+
@SuppressWarnings("squid:S4502")
1921
public class SecurityConfig {
2022
private final JwtProvider jwtProvider;
2123

@@ -27,6 +29,7 @@ public BCryptPasswordEncoder passwordEncoder() {
2729
@Bean
2830
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{
2931
http
32+
.csrf(AbstractHttpConfigurer::disable)
3033
.authorizeHttpRequests(auth -> auth
3134
// .requestMatchers("/api/**").permitAll()
3235
// .requestMatchers("/swagger-ui/**").permitAll()

0 commit comments

Comments
 (0)