Skip to content

Commit

Permalink
use ClockUtil for comparing dates
Browse files Browse the repository at this point in the history
  • Loading branch information
danielkelemen committed Sep 18, 2024
1 parent 742680e commit a976e65
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.camunda.bpm.engine.impl.util.ClockUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
Expand All @@ -34,7 +35,7 @@
import org.springframework.web.filter.OncePerRequestFilter;

import java.io.IOException;
import java.time.Clock;
import java.util.Date;

/**
* Authorize or re-authorize (if required) oauth2 client using {@link OAuth2AuthorizedClientManager}.
Expand All @@ -56,7 +57,6 @@ public class AuthorizeTokenFilter extends OncePerRequestFilter {

private static final Logger logger = LoggerFactory.getLogger(AuthorizeTokenFilter.class);
private final OAuth2AuthorizedClientManager clientManager;
private final Clock clock = Clock.systemUTC();

public AuthorizeTokenFilter(OAuth2AuthorizedClientManager clientManager) {
this.clientManager = clientManager;
Expand All @@ -76,7 +76,7 @@ protected void doFilterInternal(@Nonnull HttpServletRequest request,
}

protected boolean hasTokenExpired(OAuth2Token token) {
return token.getExpiresAt() == null || this.clock.instant().isAfter(token.getExpiresAt());
return token.getExpiresAt() == null || ClockUtil.now().after(Date.from(token.getExpiresAt()));
}

protected void clearContext(HttpServletRequest request) {
Expand Down

0 comments on commit a976e65

Please sign in to comment.