Skip to content

Commit ee03450

Browse files
authored
Merge pull request #348 from prgrms-web-devcourse-final-project/chore#347
[chore] 브랜치 병합
2 parents dc6e669 + 9ae890e commit ee03450

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

src/main/java/com/back/global/security/SecurityConfig.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,19 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
6464
.addFilterBefore(customAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
6565
.authorizeHttpRequests(auth -> auth
6666

67-
// OAuth, GET POST 둘 다 사용
68-
.requestMatchers("/oauth2/**").permitAll()
69-
.requestMatchers("/login/oauth2/**").permitAll()
70-
.requestMatchers("/h2-console/**").permitAll()
71-
72-
//르프레시 갱신 및 칵테일 검색
73-
.requestMatchers(GET, "/user/auth/me").permitAll()
74-
.requestMatchers(POST, "/user/auth/refresh").permitAll()
75-
.requestMatchers(POST, "/cocktails/search").permitAll()
76-
77-
// 권한 불필요 - 조회 API
78-
.requestMatchers(GET, "/").permitAll()
79-
.requestMatchers(GET, "/actuator/**").permitAll()
80-
81-
.requestMatchers(GET, "/cocktails/**").permitAll()
67+
// OAuth, GET POST 둘 다 사용
68+
.requestMatchers("/oauth2/**").permitAll()
69+
.requestMatchers("/login/oauth2/**").permitAll()
70+
.requestMatchers("/h2-console/**").permitAll()
71+
72+
//르프레시 갱신 및 칵테일 검색
73+
.requestMatchers(GET, "/user/auth/me").permitAll()
74+
.requestMatchers(POST, "/user/auth/refresh").permitAll()
75+
.requestMatchers(POST, "/cocktails/search").permitAll()
76+
77+
// 권한 불필요 - 조회 API
78+
.requestMatchers(GET, "/").permitAll()
79+
.requestMatchers(GET, "/actuator/**").permitAll()
8280

8381
.requestMatchers(GET, "/posts").permitAll()
8482
.requestMatchers(GET, "/posts/{postId}").permitAll()

src/main/resources/data-h2.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,12 @@ FROM CSVREAD(
3333
NULL, -- 헤더 사용 여부 (NULL이면 첫 줄을 컬럼명으로 인식)
3434
'charset=UTF-8 fieldSeparator=, fieldDelimiter="'
3535
)
36+
);
37+
38+
MERGE INTO CATEGORY KEY(ID) VALUES
39+
(1, '전체', '전체게시판'),
40+
(2, '레시피', '레시피게시판'),
41+
(3, '', '팁게시판'),
42+
(4, '질문', '질문게시판'),
43+
(5, '자유', '자유게시판');
44+

0 commit comments

Comments
 (0)