Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
.idea/
.codex/
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions .idea/compiler.xml

This file was deleted.

19 changes: 0 additions & 19 deletions .idea/dataSources.xml

This file was deleted.

409 changes: 0 additions & 409 deletions .idea/dbnavigator.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/gradle.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/jarRepositories.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules/Ontime.ontime-back.main.iml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules/devkor.ontime-back.main.iml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/modules/ontime-back.main.iml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/ontime-back.iml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/sqlDataSources.xml

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

1 change: 1 addition & 0 deletions ontime-back/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
src/main/resources/application.properties
src/main/resources/ontime-c63f1-firebase-adminsdk-fbsvc-a043cdc829.json
src/main/resources/key/AuthKey_743M7R5W3W.p8
.env

HELP.md
.gradle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import devkor.ontime_back.global.oauth.google.GoogleLoginService;
import devkor.ontime_back.global.oauth.kakao.KakaoLoginFilter;
import devkor.ontime_back.global.oauth.google.GoogleLoginFilter;
import devkor.ontime_back.repository.UserAlarmSettingRepository;
import devkor.ontime_back.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -51,6 +52,7 @@ public class SecurityConfig {
private final LoginService loginService;
private final JwtTokenProvider jwtTokenProvider;
private final UserRepository userRepository;
private final UserAlarmSettingRepository userAlarmSettingRepository;
private final ObjectMapper objectMapper;
private final AppleLoginService appleLoginService;
private final GoogleLoginService googleLoginService;
Expand All @@ -75,7 +77,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.requestMatchers("/health").permitAll() // 로드밸런서 연결 확인용 url
.anyRequest().authenticated()
)
.addFilterBefore(new KakaoLoginFilter("/oauth2/kakao/login", jwtTokenProvider, userRepository),
.addFilterBefore(new KakaoLoginFilter("/oauth2/kakao/login", jwtTokenProvider, userRepository, userAlarmSettingRepository),
UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(new GoogleLoginFilter("/oauth2/google/login", googleLoginService, userRepository),
UsernamePasswordAuthenticationFilter.class)
Expand Down Expand Up @@ -145,4 +147,4 @@ public CorsConfigurationSource corsConfigurationSource() {
source.registerCorsConfiguration("/**", configuration);
return source;
}
}
}
Loading