|
|
@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest; |
|
|
|
import org.ros.chatto.model.UserToken; |
|
|
|
import org.ros.chatto.repository.TokenRepository; |
|
|
|
import org.ros.chatto.repository.UserRoleRepository; |
|
|
|
import org.ros.chatto.service.UserTokenService; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; |
|
|
|
import org.springframework.security.core.authority.SimpleGrantedAuthority; |
|
|
@ -28,10 +29,10 @@ import org.springframework.web.filter.GenericFilterBean; |
|
|
|
public class TokenAuthenticationFilter extends GenericFilterBean { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
UserRoleRepository userRoleRepository; |
|
|
|
|
|
|
|
private TokenRepository tokenRepository; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
TokenRepository tokenRepository; |
|
|
|
private UserTokenService userTokenService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
TokenService tokenService; |
|
|
@ -51,7 +52,7 @@ public class TokenAuthenticationFilter extends GenericFilterBean { |
|
|
|
if (token == null) { |
|
|
|
throw new UsernameNotFoundException("Token not issued by us"); |
|
|
|
} |
|
|
|
UserToken userToken = tokenRepository.findByToken(accessToken); |
|
|
|
UserToken userToken = userTokenService.getTokenByTokenString(accessToken); |
|
|
|
|
|
|
|
if (userToken == null) { |
|
|
|
throw new UsernameNotFoundException("Token not associated with any user"); |
|
|
|