Skip to content

Commit

Permalink
update :: null 처리
Browse files Browse the repository at this point in the history
  • Loading branch information
4mjeo committed Mar 2, 2024
1 parent 432d9cf commit 3650664
Showing 1 changed file with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ class AuthenticationFilter(
response: HttpServletResponse,
filterChain: FilterChain
) {
if (request.requestURI.contains("/oauth2/token")) {
filterChain.doFilter(request, response)
return
}

request.getParameter("access_token")?.let { accessToken ->
setAuthenticationByAccessToken(accessToken)
Expand All @@ -52,12 +56,12 @@ class AuthenticationFilter(
val requestUserAuthority = request.getHeader("Request-User-Authorities")
val requestUserRole = request.getHeader("Request-User-Role")

val simpleGrantedAuthorities = requestUserAuthority.toList().let { authorities ->
val simpleGrantedAuthorities = requestUserAuthority?.toList()?.let { authorities ->
buildRequestAuthoritiesAndRole(requestUserRole, authorities)
.map { SimpleGrantedAuthority(it) }
}

if (simpleGrantedAuthorities.isNotEmpty()) {
if (!simpleGrantedAuthorities.isNullOrEmpty()) {
val user = User(
requestUserId,
"",
Expand All @@ -69,6 +73,7 @@ class AuthenticationFilter(
}
}


private fun setAuthenticationByAccessToken(accessToken: String) {
val tokenEntity = accessTokenEntityRepository.findByTokenValue(accessToken)
?: throw AccessTokenNotFoundException(ACCESS_TOKEN_NOT_FOUND)
Expand Down

0 comments on commit 3650664

Please sign in to comment.