-
Notifications
You must be signed in to change notification settings - Fork 0
hotfix: claims email삭제에 따른 오류 수정 #16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,43 @@ | ||
| package com.dnd.moddo.global.jwt.auth; | ||
|
|
||
| import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; | ||
| import org.springframework.security.core.Authentication; | ||
| import org.springframework.security.core.userdetails.UserDetails; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import com.dnd.moddo.global.jwt.exception.MissingTokenException; | ||
| import com.dnd.moddo.global.jwt.exception.TokenInvalidException; | ||
| import com.dnd.moddo.global.jwt.properties.JwtConstants; | ||
| import com.dnd.moddo.global.jwt.utill.JwtUtil; | ||
| import com.dnd.moddo.global.security.auth.AuthDetailsService; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| import io.jsonwebtoken.Claims; | ||
| import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; | ||
| import org.springframework.security.core.Authentication; | ||
| import org.springframework.security.core.userdetails.UserDetails; | ||
| import org.springframework.stereotype.Component; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class JwtAuth { | ||
| private final JwtUtil jwtUtil; | ||
| private final AuthDetailsService authDetailsService; | ||
| private final JwtUtil jwtUtil; | ||
| private final AuthDetailsService authDetailsService; | ||
|
|
||
| public Authentication getAuthentication(String token, String expectedTokenType) { | ||
| Claims claims = jwtUtil.getJwt(token).getBody(); | ||
| public Authentication getAuthentication(String token, String expectedTokenType) { | ||
| Claims claims = jwtUtil.getJwt(token).getBody(); | ||
|
|
||
| if (isNotExpectedToken(token, expectedTokenType)) { | ||
| throw new MissingTokenException(); | ||
| } | ||
| if (isNotExpectedToken(token, expectedTokenType)) { | ||
| throw new MissingTokenException(); | ||
| } | ||
|
|
||
| UserDetails userDetails = authDetailsService.loadUserByUsername(claims.get(JwtConstants.EMAIL.message).toString()); | ||
| return new UsernamePasswordAuthenticationToken(userDetails, "", userDetails.getAuthorities()); | ||
| } | ||
| UserDetails userDetails = authDetailsService.loadUserByUsername( | ||
| claims.get(JwtConstants.AUTH_ID.message).toString()); | ||
| return new UsernamePasswordAuthenticationToken(userDetails, "", userDetails.getAuthorities()); | ||
| } | ||
|
|
||
| private boolean isNotExpectedToken(String token, String expectedTokenType) { | ||
| if (token == null || token.isEmpty()) { | ||
| throw new TokenInvalidException(); | ||
| } | ||
| private boolean isNotExpectedToken(String token, String expectedTokenType) { | ||
| if (token == null || token.isEmpty()) { | ||
| throw new TokenInvalidException(); | ||
| } | ||
|
|
||
| String role = jwtUtil.getJwt(token).getHeader().get(JwtConstants.TYPE.message).toString(); | ||
| return !role.equals(expectedTokenType); | ||
| } | ||
| String role = jwtUtil.getJwt(token).getHeader().get(JwtConstants.TYPE.message).toString(); | ||
| return !role.equals(expectedTokenType); | ||
| } | ||
| } |
22 changes: 12 additions & 10 deletions
22
src/main/java/com/dnd/moddo/global/security/auth/AuthDetailsService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,27 @@ | ||
| package com.dnd.moddo.global.security.auth; | ||
|
|
||
| import com.dnd.moddo.domain.user.exception.UserNotFoundException; | ||
| import com.dnd.moddo.domain.user.repository.UserRepository; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.security.core.userdetails.UserDetails; | ||
| import org.springframework.security.core.userdetails.UserDetailsService; | ||
| import org.springframework.security.core.userdetails.UsernameNotFoundException; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import com.dnd.moddo.domain.user.exception.UserNotFoundException; | ||
| import com.dnd.moddo.domain.user.repository.UserRepository; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @RequiredArgsConstructor | ||
| @Transactional(readOnly = true) | ||
| @Service | ||
| public class AuthDetailsService implements UserDetailsService { | ||
|
|
||
| private final UserRepository userRepository; | ||
| private final UserRepository userRepository; | ||
|
|
||
| @Override | ||
| public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { | ||
| return userRepository.findByEmail(email) | ||
| .map(AuthDetails::new) | ||
| .orElseThrow(() -> new UserNotFoundException(email)); | ||
| } | ||
| @Override | ||
| public UserDetails loadUserByUsername(String id) throws UsernameNotFoundException { | ||
| return userRepository.findById(Long.parseLong(id)) | ||
| .map(AuthDetails::new) | ||
| .orElseThrow(() -> new UserNotFoundException(id)); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
id 파싱 오류 처리 및 예외 메시지 오버로드 수정
아래처럼 수정해 주세요.
📝 Committable suggestion
🤖 Prompt for AI Agents