Skip to content

Commit 10f9546

Browse files
authored
Merge pull request #6 from NET-ZERO-FitFit/develop
[CICD] main <- develop (securityConfig 내 api.fitfit.site API 호출 허용)
2 parents 7cda389 + 7054630 commit 10f9546

4 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/main/java/fitfit/domain/member/repository/MemberRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
public interface MemberRepository extends JpaRepository<Member, Long> {
99
Optional<Member> findByProviderId(String sub);
1010

11-
boolean existsByName(String name);
11+
boolean existsByNickname(String nickname);
1212
}

src/main/java/fitfit/domain/member/service/MemberCommandService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private boolean validateAdditionalInfo(MemberRequestDTO.MemberSignupRequest requ
194194
@Override
195195
@Transactional(readOnly = true)
196196
public void checkNickname(String nickname) {
197-
if (memberRepository.existsByName(nickname)) {
197+
if (memberRepository.existsByNickname(nickname)) {
198198
throw new MemberHandler(ErrorStatus.NICKNAME_ALREADY_EXISTS);
199199
}
200200
}

src/main/java/fitfit/domain/token/filter/JwtAuthenticationFilter.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
2828
"/swagger-ui/**",
2929
"/v3/api-docs/**",
3030
"/swagger-resources/**",
31-
"/webjars/**",
32-
"/auth/**",
3331
"/api/members/auth/kko",
34-
"/auth/refresh"
32+
"/api/members/auth/refresh"
3533
);
3634

3735
private final JwtProvider jwtProvider;

src/main/java/fitfit/global/security/config/SecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public SecurityFilterChain filterChain (HttpSecurity http) throws Exception {
5555
@Bean
5656
public CorsConfigurationSource corsConfigurationSource() {
5757
CorsConfiguration config = new CorsConfiguration();
58-
config.setAllowedOrigins(List.of("http://localhost:3000", "https://fitfit.site"));
58+
config.setAllowedOrigins(List.of("http://localhost:3000", "https://fitfit.site", "https://api.fitfit.site"));
5959
config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
6060
config.setAllowedHeaders(List.of("*"));
6161
config.setAllowCredentials(true);

0 commit comments

Comments
 (0)