Skip to content

Commit

Permalink
[#16] refactor: security context holder 내에 token 생성 기능 메소드 분리
Browse files Browse the repository at this point in the history
  • Loading branch information
jinyoungchoi95 committed Aug 21, 2021
1 parent 8768ac9 commit e97bff4
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ public ResponseEntity<UserResponse> login(@RequestBody UserLoginRequest request)
public ResponseEntity<UserResponse> getCurrentUser(@AuthenticationPrincipal Long loginId) {
User user = userService
.findById(loginId).orElseThrow(RuntimeException::new); // 임시
String token = SecurityContextHolder.getContext().getAuthentication().getCredentials()
.toString();
return ResponseEntity.ok()
.body(fromUserAndToken(user, token));
.body(fromUserAndToken(user, getTokenByContextHolder()));
}

@PutMapping("/user")
public ResponseEntity<UserResponse> update(@RequestBody UserUpdateRequest request,
@AuthenticationPrincipal Long loginId) {
User user = userService
.update(request.toUserUpdateModel(), loginId);
String token = SecurityContextHolder.getContext().getAuthentication().getCredentials()
.toString();
return ResponseEntity.ok()
.body(fromUserAndToken(user, token));
.body(fromUserAndToken(user, getTokenByContextHolder()));
}

private String getTokenByContextHolder() {
return SecurityContextHolder.getContext().getAuthentication().getCredentials().toString();
}

}

0 comments on commit e97bff4

Please sign in to comment.