Skip to content

Commit de99205

Browse files
sungchaewonsungchaewon
committed
chore: FixLog 디렉토리 통일 및 로그인 관련 파일 복구, 충돌 해결 완료
1 parent 1e79909 commit de99205

76 files changed

Lines changed: 626 additions & 709 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@ repositories {
2525

2626
dependencies {
2727
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
28-
// implementation 'org.springframework.boot:spring-boot-starter-security'
28+
implementation 'org.springframework.boot:spring-boot-starter-security'
2929
implementation 'org.springframework.boot:spring-boot-starter-web'
30-
compileOnly 'org.projectlombok:lombok'
30+
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
31+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
32+
runtimeOnly('io.jsonwebtoken:jjwt-jackson:0.11.5')
3133
runtimeOnly 'com.h2database:h2'
3234
runtimeOnly 'com.mysql:mysql-connector-j'
35+
compileOnly 'org.projectlombok:lombok'
3336
annotationProcessor 'org.projectlombok:lombok'
3437
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3538
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

src/main/java/com/example/fixlog/FixLogApplication.java renamed to src/main/java/com/example/FixLog/FixLogApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.fixlog;
1+
package com.example.FixLog;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

‎src/main/java/com/example/FixLog/config/JwtAuthenticationFilter.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package com.example.FixLog.config;
2+
3+
import com.example.FixLog.domain.member.Member;
4+
import com.example.FixLog.exception.CustomException;
5+
import com.example.FixLog.repository.MemberRepository;
6+
import com.example.FixLog.util.JwtUtil;
7+
import java.io.IOException;
8+
import jakarta.servlet.FilterChain;
9+
import jakarta.servlet.ServletException;
10+
import jakarta.servlet.http.HttpServletRequest;
11+
import jakarta.servlet.http.HttpServletResponse;
12+
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
13+
import org.springframework.security.core.Authentication;
14+
import org.springframework.security.core.context.SecurityContextHolder;
15+
import org.springframework.util.StringUtils;
16+
import org.springframework.web.filter.OncePerRequestFilter;
17+
import com.example.FixLog.exception.ErrorCode;
18+
19+
public class JwtAuthenticationFilter extends OncePerRequestFilter {
20+
21+
private final JwtUtil jwtUtil;
22+
private final MemberRepository memberRepository;
23+
24+
public JwtAuthenticationFilter(JwtUtil jwtUtil, MemberRepository memberRepository) {
25+
this.jwtUtil = jwtUtil;
26+
this.memberRepository = memberRepository;
27+
}
28+
29+
@Override
30+
protected void doFilterInternal(HttpServletRequest request,
31+
HttpServletResponse response,
32+
FilterChain filterChain)
33+
throws ServletException, IOException {
34+
35+
String token = resolveToken(request);
36+
37+
if (token != null && jwtUtil.isTokenValid(token)) {
38+
String email = jwtUtil.getEmailFromToken(token);
39+
Member member = memberRepository.findByEmail(email)
40+
.orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
41+
42+
Authentication auth = new UsernamePasswordAuthenticationToken(member, null, member.getAuthorities());
43+
SecurityContextHolder.getContext().setAuthentication(auth);
44+
}
45+
46+
filterChain.doFilter(request, response);
47+
}
48+
49+
private String resolveToken(HttpServletRequest request) {
50+
String bearerToken = request.getHeader("Authorization");
51+
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
52+
return bearerToken.substring(7);
53+
}
54+
return null;
55+
}
56+
}

‎src/main/java/com/example/FixLog/config/SecurityConfig.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package com.example.FixLog.config;
2+
3+
import com.example.FixLog.repository.MemberRepository;
4+
import com.example.FixLog.util.JwtUtil;
5+
import jakarta.servlet.Filter;
6+
import lombok.RequiredArgsConstructor;
7+
import org.springframework.context.annotation.Bean;
8+
import org.springframework.context.annotation.Configuration;
9+
import org.springframework.http.HttpMethod;
10+
import org.springframework.security.authentication.AuthenticationManager;
11+
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
12+
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
13+
import org.springframework.security.web.SecurityFilterChain;
14+
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
15+
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
16+
import org.springframework.security.crypto.password.PasswordEncoder;
17+
18+
@Configuration
19+
@RequiredArgsConstructor
20+
public class SecurityConfig {
21+
22+
private final JwtUtil jwtUtil;
23+
private final MemberRepository memberRepository;
24+
25+
@Bean
26+
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
27+
http
28+
.csrf(csrf -> csrf.disable())
29+
.authorizeHttpRequests(auth -> auth
30+
.requestMatchers(HttpMethod.POST, "/api/members/signup").permitAll()
31+
.requestMatchers(HttpMethod.POST, "/api/auth/login").permitAll()
32+
.requestMatchers(HttpMethod.GET, "/api/members/check-email").permitAll()
33+
.requestMatchers(HttpMethod.GET, "/api/members/check-nickname").permitAll()
34+
.requestMatchers(HttpMethod.GET, "/h2-console/**").permitAll()
35+
.anyRequest().authenticated()
36+
)
37+
.headers(headers -> headers.frameOptions(frame -> frame.disable())) // H2 콘솔용
38+
.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
39+
40+
return http.build();
41+
}
42+
43+
@Bean
44+
public Filter jwtAuthenticationFilter() {
45+
return new JwtAuthenticationFilter(jwtUtil, memberRepository);
46+
}
47+
48+
@Bean
49+
public PasswordEncoder passwordEncoder() {
50+
return new BCryptPasswordEncoder();
51+
}
52+
53+
// 인증 매니저 (선택: 로그인 시 AuthenticationManager 사용 가능)
54+
@Bean
55+
public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
56+
return config.getAuthenticationManager();
57+
}
58+
}

‎src/main/java/com/example/FixLog/controller/AuthController.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.example.FixLog.controller;
2+
3+
import com.example.FixLog.dto.Response;
4+
import com.example.FixLog.dto.member.LoginRequestDto;
5+
import com.example.FixLog.dto.member.LoginResponseDto;
6+
import com.example.FixLog.service.AuthService;
7+
import lombok.RequiredArgsConstructor;
8+
import org.springframework.http.ResponseEntity;
9+
import org.springframework.web.bind.annotation.*;
10+
11+
@RestController
12+
@RequestMapping("/api/auth")
13+
@RequiredArgsConstructor
14+
public class AuthController {
15+
16+
private final AuthService authService;
17+
18+
@PostMapping("/login")
19+
public ResponseEntity<Response<LoginResponseDto>> login(@RequestBody LoginRequestDto requestDto) {
20+
LoginResponseDto result = authService.login(requestDto);
21+
return ResponseEntity.ok(Response.success("로그인 성공", result));
22+
}
23+
}

src/main/java/com/example/fixlog/controller/BookmarkFolderController.java renamed to src/main/java/com/example/FixLog/controller/BookmarkFolderController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.fixlog.controller;
1+
package com.example.FixLog.controller;
22

33
import com.example.FixLog.dto.Response;
44
import com.example.FixLog.dto.bookmark.request.BookmarkFolderCreateRequest;

src/main/java/com/example/fixlog/controller/FollowController.java renamed to src/main/java/com/example/FixLog/controller/FollowController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.fixlog.controller;
1+
package com.example.FixLog.controller;
22

33
import com.example.FixLog.dto.Response;
44
import com.example.FixLog.dto.follow.request.FollowRequestDto;

src/main/java/com/example/fixlog/controller/MainPageController.java renamed to src/main/java/com/example/FixLog/controller/MainPageController.java

File renamed without changes.

‎src/main/java/com/example/FixLog/controller/MemberController.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.example.FixLog.controller;
2+
3+
4+
import com.example.FixLog.domain.member.Member;
5+
import com.example.FixLog.dto.Response;
6+
import com.example.FixLog.dto.member.MemberInfoResponseDto;
7+
import com.example.FixLog.dto.member.SignupRequestDto;
8+
import com.example.FixLog.dto.member.DuplicateCheckResponseDto;
9+
import com.example.FixLog.service.MemberService;
10+
import lombok.RequiredArgsConstructor;
11+
import org.springframework.http.ResponseEntity;
12+
import org.springframework.security.core.annotation.AuthenticationPrincipal;
13+
import org.springframework.web.bind.annotation.*;
14+
15+
@RestController
16+
@RequestMapping("/api/members")
17+
@RequiredArgsConstructor
18+
public class MemberController {
19+
20+
private final MemberService memberService;
21+
22+
@PostMapping("/signup")
23+
public ResponseEntity<Response<String>> signup(@RequestBody SignupRequestDto request) {
24+
memberService.signup(request);
25+
return ResponseEntity.ok(Response.success("회원가입 성공", null));
26+
}
27+
28+
@GetMapping("/check-email")
29+
public ResponseEntity<Response<DuplicateCheckResponseDto>> checkEmail(@RequestParam String email) {
30+
boolean exists = memberService.isEmailDuplicated(email);
31+
String msg = exists ? "이미 사용 중인 이메일입니다." : "사용 가능한 이메일입니다.";
32+
return ResponseEntity.ok(Response.success(msg, new DuplicateCheckResponseDto(exists)));
33+
}
34+
35+
@GetMapping("/check-nickname")
36+
public ResponseEntity<Response<DuplicateCheckResponseDto>> checkNickname(@RequestParam String nickname) {
37+
boolean exists = memberService.isNicknameDuplicated(nickname);
38+
String msg = exists ? "이미 사용 중인 닉네임입니다." : "사용 가능한 닉네임입니다.";
39+
return ResponseEntity.ok(Response.success(msg, new DuplicateCheckResponseDto(exists)));
40+
}
41+
42+
@GetMapping("/me")
43+
public ResponseEntity<Response<MemberInfoResponseDto>> getMyInfo(@AuthenticationPrincipal Member member) {
44+
MemberInfoResponseDto responseDto = new MemberInfoResponseDto(
45+
member.getEmail(),
46+
member.getNickname(),
47+
member.getProfileImageUrl(),
48+
member.getBio(),
49+
member.getSocialType()
50+
);
51+
return ResponseEntity.ok(Response.success("회원 정보 조회 성공", responseDto));
52+
}
53+
}

src/main/java/com/example/fixlog/controller/PostController.java renamed to src/main/java/com/example/FixLog/controller/PostController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.example.fixlog.controller;
1+
package com.example.FixLog.controller;
22

3-
import com.example.fixlog.dto.UserIdDto;
4-
import com.example.fixlog.dto.post.PostRequestDto;
5-
import com.example.fixlog.dto.Response;
6-
import com.example.fixlog.service.PostService;
3+
import com.example.FixLog.dto.UserIdDto;
4+
import com.example.FixLog.dto.post.PostRequestDto;
5+
import com.example.FixLog.dto.Response;
6+
import com.example.FixLog.service.PostService;
77
import org.springframework.web.bind.annotation.*;
88

99
@RestController

0 commit comments

Comments
 (0)