diff --git a/src/main/java/org/example/siljeun/domain/auth/controller/AuthController.java b/src/main/java/org/example/siljeun/domain/auth/controller/AuthController.java index e44d655..0ee8150 100644 --- a/src/main/java/org/example/siljeun/domain/auth/controller/AuthController.java +++ b/src/main/java/org/example/siljeun/domain/auth/controller/AuthController.java @@ -1,22 +1,35 @@ package org.example.siljeun.domain.auth.controller; import lombok.RequiredArgsConstructor; -import org.example.siljeun.domain.auth.dto.LoginRequest; -import org.example.siljeun.domain.auth.dto.LoginResponse; +import org.example.siljeun.domain.auth.dto.request.LoginRequest; +import org.example.siljeun.domain.auth.dto.request.SignUpRequest; +import org.example.siljeun.domain.auth.dto.response.LoginResponse; +import org.example.siljeun.domain.auth.dto.response.SignUpResponse; import org.example.siljeun.domain.auth.service.AuthService; import org.example.siljeun.global.dto.ResponseDto; -import org.springframework.stereotype.Controller; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping("/auth") @RequiredArgsConstructor public class AuthController { private final AuthService authService; + @PostMapping("/signup") + public ResponseEntity signUp(@RequestBody SignUpRequest request) { + SignUpResponse response = authService.signUp(request); + if (response != null) { + return ResponseEntity.ok(response); + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + @PostMapping("/login") public ResponseDto login(@RequestBody LoginRequest request) { try { diff --git a/src/main/java/org/example/siljeun/domain/auth/dto/LoginRequest.java b/src/main/java/org/example/siljeun/domain/auth/dto/request/LoginRequest.java similarity index 55% rename from src/main/java/org/example/siljeun/domain/auth/dto/LoginRequest.java rename to src/main/java/org/example/siljeun/domain/auth/dto/request/LoginRequest.java index 7a12f6a..f8fe48c 100644 --- a/src/main/java/org/example/siljeun/domain/auth/dto/LoginRequest.java +++ b/src/main/java/org/example/siljeun/domain/auth/dto/request/LoginRequest.java @@ -1,4 +1,4 @@ -package org.example.siljeun.domain.auth.dto; +package org.example.siljeun.domain.auth.dto.request; public record LoginRequest(String username, String password) { diff --git a/src/main/java/org/example/siljeun/domain/auth/dto/request/SignUpRequest.java b/src/main/java/org/example/siljeun/domain/auth/dto/request/SignUpRequest.java new file mode 100644 index 0000000..b2008b0 --- /dev/null +++ b/src/main/java/org/example/siljeun/domain/auth/dto/request/SignUpRequest.java @@ -0,0 +1,13 @@ +package org.example.siljeun.domain.auth.dto.request; + +import org.example.siljeun.domain.user.enums.Provider; +import org.example.siljeun.domain.user.enums.Role; + +public record SignUpRequest(String email, + String username, + String password, + String nickname, + Role role, + Provider provider) { + +} \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/domain/auth/dto/LoginResponse.java b/src/main/java/org/example/siljeun/domain/auth/dto/response/LoginResponse.java similarity index 52% rename from src/main/java/org/example/siljeun/domain/auth/dto/LoginResponse.java rename to src/main/java/org/example/siljeun/domain/auth/dto/response/LoginResponse.java index 640e04d..eb6ca2d 100644 --- a/src/main/java/org/example/siljeun/domain/auth/dto/LoginResponse.java +++ b/src/main/java/org/example/siljeun/domain/auth/dto/response/LoginResponse.java @@ -1,7 +1,11 @@ -package org.example.siljeun.domain.auth.dto; +package org.example.siljeun.domain.auth.dto.response; +import lombok.Getter; import lombok.RequiredArgsConstructor; +import lombok.Setter; +@Getter +@Setter @RequiredArgsConstructor public class LoginResponse { diff --git a/src/main/java/org/example/siljeun/domain/auth/dto/response/SignUpResponse.java b/src/main/java/org/example/siljeun/domain/auth/dto/response/SignUpResponse.java new file mode 100644 index 0000000..7d354ec --- /dev/null +++ b/src/main/java/org/example/siljeun/domain/auth/dto/response/SignUpResponse.java @@ -0,0 +1,14 @@ +package org.example.siljeun.domain.auth.dto.response; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class SignUpResponse { + + private Long id; + private String email; + private String username; + +} diff --git a/src/main/java/org/example/siljeun/domain/auth/service/AuthService.java b/src/main/java/org/example/siljeun/domain/auth/service/AuthService.java index a056f66..06e35fc 100644 --- a/src/main/java/org/example/siljeun/domain/auth/service/AuthService.java +++ b/src/main/java/org/example/siljeun/domain/auth/service/AuthService.java @@ -1,26 +1,35 @@ package org.example.siljeun.domain.auth.service; import lombok.RequiredArgsConstructor; -import org.example.siljeun.domain.auth.dto.LoginResponse; +import org.example.siljeun.domain.auth.dto.request.SignUpRequest; +import org.example.siljeun.domain.auth.dto.response.LoginResponse; +import org.example.siljeun.domain.auth.dto.response.SignUpResponse; +import org.example.siljeun.domain.user.entity.User; +import org.example.siljeun.domain.user.repository.UserRepository; import org.example.siljeun.global.security.JwtUtil; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor public class AuthService { - private final AuthenticationManagerBuilder authManagerBuilder; private final JwtUtil jwtUtil; + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; - public LoginResponse login(String username, String password) { - Authentication authentication = authManagerBuilder.getObject() - .authenticate(new UsernamePasswordAuthenticationToken(username, password)); + public SignUpResponse signUp(SignUpRequest request) { + // 비밀번호 암호화 + String password = passwordEncoder.encode(request.password()); + + User user = new User(request.email(), request.username(), password, request.nickname(), + request.role(), request.provider()); + User savedUser = userRepository.save(user); - SecurityContextHolder.getContext().setAuthentication(authentication); + return new SignUpResponse(savedUser.getId(), savedUser.getEmail(), savedUser.getUsername()); + } + + public LoginResponse login(String username, String password) { String token = jwtUtil.createToken(username); return new LoginResponse(token); diff --git a/src/main/java/org/example/siljeun/domain/concert/controller/ConcertController.java b/src/main/java/org/example/siljeun/domain/concert/controller/ConcertController.java index 209010c..8a03da4 100644 --- a/src/main/java/org/example/siljeun/domain/concert/controller/ConcertController.java +++ b/src/main/java/org/example/siljeun/domain/concert/controller/ConcertController.java @@ -9,7 +9,7 @@ import org.example.siljeun.domain.concert.dto.response.ConcertDetailResponse; import org.example.siljeun.domain.concert.dto.response.ConcertSimpleResponse; import org.example.siljeun.domain.concert.service.ConcertService; -import org.example.siljeun.global.security.CustomUserDetails; +import org.example.siljeun.global.security.PrincipalDetails; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.DeleteMapping; @@ -31,7 +31,7 @@ public class ConcertController { @PostMapping public ResponseEntity createConcert( @RequestBody @Valid ConcertCreateRequest request, - @AuthenticationPrincipal CustomUserDetails userDetails + @AuthenticationPrincipal PrincipalDetails userDetails ) { Long concertId = concertService.createConcert(request, userDetails.getUserId()); return ResponseEntity.created(URI.create("/concerts" + concertId)).body(concertId); diff --git a/src/main/java/org/example/siljeun/domain/oauth/client/KakaoApiClient.java b/src/main/java/org/example/siljeun/domain/oauth/client/KakaoApiClient.java index 48f2107..3d1f01a 100644 --- a/src/main/java/org/example/siljeun/domain/oauth/client/KakaoApiClient.java +++ b/src/main/java/org/example/siljeun/domain/oauth/client/KakaoApiClient.java @@ -29,14 +29,14 @@ public String getAccessToken(String code) { MultiValueMap params = new LinkedMultiValueMap<>(); params.add("grant_type", "authorization_code"); - params.add("client_id", properties.getClientId()); - params.add("redirect_uri", properties.getRedirectUri()); + params.add("client_id", "eaee0e144aeb9afef54d5c449448baea"); + params.add("redirect_uri", "http://localhost:8080/oauth/kakao/callback"); params.add("code", code); HttpEntity> request = new HttpEntity<>(params, headers); ResponseEntity> response = restTemplate.exchange( - properties.getTokenUri(), + "https://kauth.kakao.com/oauth/token", HttpMethod.POST, request, new ParameterizedTypeReference<>() { @@ -57,7 +57,7 @@ public KakaoUserInfo getUserInfo(String accessToken) { HttpEntity request = new HttpEntity<>(headers); ResponseEntity response = restTemplate.exchange( - properties.getUserInfoUri(), + "https://kapi.kakao.com/v2/user/me", HttpMethod.GET, request, KakaoUserInfo.class diff --git a/src/main/java/org/example/siljeun/domain/oauth/client/NaverApiClient.java b/src/main/java/org/example/siljeun/domain/oauth/client/NaverApiClient.java new file mode 100644 index 0000000..88c1713 --- /dev/null +++ b/src/main/java/org/example/siljeun/domain/oauth/client/NaverApiClient.java @@ -0,0 +1,5 @@ +package org.example.siljeun.domain.oauth.client; + +public class NaverApiClient { + +} diff --git a/src/main/java/org/example/siljeun/domain/oauth/dto/KakaoUserInfo.java b/src/main/java/org/example/siljeun/domain/oauth/dto/KakaoUserInfo.java index c1afefe..f5c855f 100644 --- a/src/main/java/org/example/siljeun/domain/oauth/dto/KakaoUserInfo.java +++ b/src/main/java/org/example/siljeun/domain/oauth/dto/KakaoUserInfo.java @@ -1,14 +1,41 @@ package org.example.siljeun.domain.oauth.dto; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public class KakaoUserInfo { +public class KakaoUserInfo implements OAuth2UserInfo { - private Long id; - private String email; - private String nickname; + private Map attributes; + private Map attributesAccount; + private Map attributesProfile; + + public KakaoUserInfo(Map attributes) { + this.attributes = attributes; + this.attributesAccount = (Map) attributes.get("kakao_account"); + this.attributesProfile = (Map) attributesAccount.get("profile"); + } + + @Override + public String getProvider() { + return "Kakao"; + } + + @Override + public String getProviderId() { + return attributes.get("id").toString(); + } + + @Override + public String getEmail() { + return attributesAccount.get("email").toString(); + } + + @Override + public String getNickname() { + return attributesProfile.get("nickname").toString(); + } } \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/domain/oauth/dto/NaverUserInfo.java b/src/main/java/org/example/siljeun/domain/oauth/dto/NaverUserInfo.java new file mode 100644 index 0000000..3aff8c2 --- /dev/null +++ b/src/main/java/org/example/siljeun/domain/oauth/dto/NaverUserInfo.java @@ -0,0 +1,5 @@ +package org.example.siljeun.domain.oauth.dto; + +public class NaverUserInfo { + +} diff --git a/src/main/java/org/example/siljeun/domain/oauth/dto/OAuth2UserInfo.java b/src/main/java/org/example/siljeun/domain/oauth/dto/OAuth2UserInfo.java new file mode 100644 index 0000000..e47bd09 --- /dev/null +++ b/src/main/java/org/example/siljeun/domain/oauth/dto/OAuth2UserInfo.java @@ -0,0 +1,17 @@ +package org.example.siljeun.domain.oauth.dto; + +import java.util.Map; + +public interface OAuth2UserInfo { + + public Map getAttributes(); + + String getProvider(); + + String getProviderId(); + + String getEmail(); + + String getNickname(); + +} \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/domain/oauth/service/KakaoOAuthService.java b/src/main/java/org/example/siljeun/domain/oauth/service/KakaoOAuthService.java index ffe393d..8776f1c 100644 --- a/src/main/java/org/example/siljeun/domain/oauth/service/KakaoOAuthService.java +++ b/src/main/java/org/example/siljeun/domain/oauth/service/KakaoOAuthService.java @@ -34,7 +34,7 @@ public String kakaoLogin(String code) { private User registerUser(KakaoUserInfo userInfo) { User user = new User(userInfo.getEmail(), userInfo.getNickname(), Provider.KAKAO, - userInfo.getId()); + userInfo.getProviderId()); return userRepository.save(user); } diff --git a/src/main/java/org/example/siljeun/domain/oauth/service/NaverOAuthService.java b/src/main/java/org/example/siljeun/domain/oauth/service/NaverOAuthService.java new file mode 100644 index 0000000..0fec45e --- /dev/null +++ b/src/main/java/org/example/siljeun/domain/oauth/service/NaverOAuthService.java @@ -0,0 +1,8 @@ +package org.example.siljeun.domain.oauth.service; + +import org.springframework.stereotype.Service; + +@Service +public class NaverOAuthService { + +} \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/domain/user/controller/UserController.java b/src/main/java/org/example/siljeun/domain/user/controller/UserController.java index 80e8b5b..4e40c31 100644 --- a/src/main/java/org/example/siljeun/domain/user/controller/UserController.java +++ b/src/main/java/org/example/siljeun/domain/user/controller/UserController.java @@ -5,4 +5,6 @@ @Controller public class UserController { -} + // TODO: 마이 페이지, 회원 정보 수정 등 + +} \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/domain/user/entity/User.java b/src/main/java/org/example/siljeun/domain/user/entity/User.java index bf4d338..ddb0653 100644 --- a/src/main/java/org/example/siljeun/domain/user/entity/User.java +++ b/src/main/java/org/example/siljeun/domain/user/entity/User.java @@ -9,8 +9,8 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import java.time.LocalDateTime; -import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import org.example.siljeun.domain.user.enums.Provider; import org.example.siljeun.domain.user.enums.Role; import org.example.siljeun.global.entity.BaseEntity; @@ -18,6 +18,7 @@ @Getter @Entity @Table(name = "users") +@NoArgsConstructor public class User extends BaseEntity { @Id @@ -47,11 +48,21 @@ public class User extends BaseEntity { @Column(nullable = false) private Provider provider; - private Long providerId; + private String providerId; private LocalDateTime deletedAt; - public User(String email, String nickname, Provider provider, Long providerId) { + public User(String email, String username, String password, String nickname, Role role, + Provider provider) { + this.email = email; + this.username = username; + this.password = password; + this.nickname = nickname; + this.role = role; + this.provider = provider; + } + + public User(String email, String nickname, Provider provider, String providerId) { this.email = email; this.nickname = nickname; this.provider = provider; diff --git a/src/main/java/org/example/siljeun/domain/user/service/CustomUserDetailsService.java b/src/main/java/org/example/siljeun/domain/user/service/PrincipalDetailsService.java similarity index 73% rename from src/main/java/org/example/siljeun/domain/user/service/CustomUserDetailsService.java rename to src/main/java/org/example/siljeun/domain/user/service/PrincipalDetailsService.java index 702ae42..5d81400 100644 --- a/src/main/java/org/example/siljeun/domain/user/service/CustomUserDetailsService.java +++ b/src/main/java/org/example/siljeun/domain/user/service/PrincipalDetailsService.java @@ -1,9 +1,9 @@ package org.example.siljeun.domain.user.service; -import java.util.List; import lombok.RequiredArgsConstructor; import org.example.siljeun.domain.user.entity.User; import org.example.siljeun.domain.user.repository.UserRepository; +import org.example.siljeun.global.security.PrincipalDetails; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -11,16 +11,15 @@ @Service @RequiredArgsConstructor -public class CustomUserDetailsService implements UserDetailsService { +public class PrincipalDetailsService implements UserDetailsService { private final UserRepository userRepository; @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - User user = userRepository.findByUsername(username) + User principal = userRepository.findByUsername(username) .orElseThrow(() -> new UsernameNotFoundException("사용자를 찾을 수 없습니다.")); - return new org.springframework.security.core.userdetails.User(user.getUsername(), - user.getPassword(), List.of()); + return new PrincipalDetails(principal); } } \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/global/config/NaverOAuthProperties.java b/src/main/java/org/example/siljeun/global/config/NaverOAuthProperties.java new file mode 100644 index 0000000..2ca3fbc --- /dev/null +++ b/src/main/java/org/example/siljeun/global/config/NaverOAuthProperties.java @@ -0,0 +1,20 @@ +package org.example.siljeun.global.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Getter +@Setter +@Configuration +@ConfigurationProperties(prefix = "naver") +public class NaverOAuthProperties { + + private String clientId; + private String clientSecret; + private String redirectUri; + private String tokenUri; + private String userInfoUri; + +} \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/global/config/SecurityConfig.java b/src/main/java/org/example/siljeun/global/config/SecurityConfig.java index 9f3ef6e..fe2219f 100644 --- a/src/main/java/org/example/siljeun/global/config/SecurityConfig.java +++ b/src/main/java/org/example/siljeun/global/config/SecurityConfig.java @@ -1,7 +1,7 @@ package org.example.siljeun.global.config; import lombok.RequiredArgsConstructor; -import org.example.siljeun.domain.user.service.CustomUserDetailsService; +import org.example.siljeun.domain.user.service.PrincipalDetailsService; import org.example.siljeun.global.security.CustomOAuth2SuccessHandler; import org.example.siljeun.global.security.JwtAuthenticationFilter; import org.example.siljeun.global.security.JwtUtil; @@ -14,6 +14,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.stereotype.Component; @Configuration @EnableWebSecurity @@ -21,14 +22,13 @@ public class SecurityConfig { private final JwtUtil jwtUtil; - private final CustomUserDetailsService userDetailsService; + private final PrincipalDetailsService userDetailsService; private final CustomOAuth2SuccessHandler customOAuth2SuccessHandler; @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .csrf(csrf -> csrf.disable()) - .formLogin(form -> form.disable()) .sessionManagement(session -> session .sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(auth -> auth @@ -46,8 +46,14 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti return http.build(); } + @Bean + public JwtAuthenticationFilter jwtAuthenticationFilter() { + return new JwtAuthenticationFilter(jwtUtil, userDetailsService); + } + @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } + } \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/global/security/CustomOAuth2SuccessHandler.java b/src/main/java/org/example/siljeun/global/security/CustomOAuth2SuccessHandler.java index f4f70c2..dff18e0 100644 --- a/src/main/java/org/example/siljeun/global/security/CustomOAuth2SuccessHandler.java +++ b/src/main/java/org/example/siljeun/global/security/CustomOAuth2SuccessHandler.java @@ -1,6 +1,7 @@ package org.example.siljeun.global.security; import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @@ -20,20 +21,25 @@ public class CustomOAuth2SuccessHandler implements AuthenticationSuccessHandler @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { - // 1. principal에서 사용자 정보 추출 + // principal에서 사용자 정보 추출 OAuth2User oAuth2User = (OAuth2User) authentication.getPrincipal(); String username = "kakao_" + oAuth2User.getAttribute("id").toString(); - // 2. JWT 생성 + // JWT 생성 String token = jwtUtil.createToken(username); - // 3. JSON 응답 세팅 - response.setStatus(HttpServletResponse.SC_OK); - response.setContentType("application/json;charset=UTF-8"); + // JWT를 HttpOnly 쿠키로 설정 + Cookie cookie = new Cookie("token", token); + cookie.setHttpOnly(true); + cookie.setSecure(false); // 개발 환경에서는 false, HTTPS 환경에서는 true + cookie.setPath("/"); + cookie.setMaxAge(60 * 60); // 1시간 + + response.addCookie(cookie); - // 4. JWT를 JSON 응답 바디로 내려주기 - String json = String.format("{\"token\":\"%s\"}", token); - response.getWriter().write(json); + // 응답 상태만 OK로 설정 + response.setStatus(HttpServletResponse.SC_OK); + response.getWriter().write("{\"message\": \"Login successful\"}"); response.getWriter().flush(); } diff --git a/src/main/java/org/example/siljeun/global/security/JwtAuthenticationFilter.java b/src/main/java/org/example/siljeun/global/security/JwtAuthenticationFilter.java index e8334a3..a8ad690 100644 --- a/src/main/java/org/example/siljeun/global/security/JwtAuthenticationFilter.java +++ b/src/main/java/org/example/siljeun/global/security/JwtAuthenticationFilter.java @@ -1,6 +1,5 @@ package org.example.siljeun.global.security; -import jakarta.annotation.Nonnull; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -8,7 +7,7 @@ import java.io.IOException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.example.siljeun.domain.user.service.CustomUserDetailsService; +import org.example.siljeun.domain.user.service.PrincipalDetailsService; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -20,15 +19,12 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { private final JwtUtil jwtUtil; - private final CustomUserDetailsService userDetailsService; + private final PrincipalDetailsService userDetailsService; @Override - protected void doFilterInternal( - @Nonnull HttpServletRequest request, - @Nonnull HttpServletResponse response, - @Nonnull FilterChain filterChain - ) throws ServletException, IOException { - String token = resolveToken(request); + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, + FilterChain filterChain) throws ServletException, IOException { + String token = resolveTokenFromHeader(request); if (token != null) { if (jwtUtil.validateToken(token)) { @@ -53,14 +49,23 @@ protected void doFilterInternal( filterChain.doFilter(request, response); } - private String resolveToken(HttpServletRequest request) { + private String resolveTokenFromHeader(HttpServletRequest request) { String bearer = request.getHeader("Authorization"); - if (bearer != null && bearer.startsWith(JwtUtil.BEARER_PREFIX)) { return bearer.substring(JwtUtil.BEARER_PREFIX.length()); } - return null; } +// private String resolveTokenFromCookie(HttpServletRequest request) { +// if (request.getCookies() != null) { +// return Arrays.stream(request.getCookies()) +// .filter(cookie -> cookie.getName().equals("token")) +// .map(Cookie::getValue) +// .findFirst() +// .orElse(null); +// } +// return null; +// } + } \ No newline at end of file diff --git a/src/main/java/org/example/siljeun/global/security/CustomUserDetails.java b/src/main/java/org/example/siljeun/global/security/PrincipalDetails.java similarity index 92% rename from src/main/java/org/example/siljeun/global/security/CustomUserDetails.java rename to src/main/java/org/example/siljeun/global/security/PrincipalDetails.java index aa82025..40c0d2a 100644 --- a/src/main/java/org/example/siljeun/global/security/CustomUserDetails.java +++ b/src/main/java/org/example/siljeun/global/security/PrincipalDetails.java @@ -9,7 +9,7 @@ import org.springframework.security.core.userdetails.UserDetails; @RequiredArgsConstructor -public class CustomUserDetails implements UserDetails { +public class PrincipalDetails implements UserDetails { private final User user; @@ -19,7 +19,7 @@ public Long getUserId() { @Override public String getUsername() { - return ""; + return user.getUsername(); } @Override