Skip to content

NIFI-15070 Fixed OAuth2AccessTokenProvider to properly handle permane… #10401

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

NIFI-15070 Fixed OAuth2AccessTokenProvider to properly handle permane… #10401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd2cf5
NIFI-15070 Fixed OAuth2AccessTokenProvider to properly handle permane…
turcsanyip Oct 7, 2025
20ec6f3
NIFI-15070 Review changes
turcsanyip Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions ...d-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ public class AccessToken {
private String accessToken;
private String refreshToken;
private String tokenType;
private long expiresIn;
private Long expiresIn;
private String scope;

private final Instant fetchTime;

private final Map<String, Object> additionalParameters = new HashMap<>();

public AccessToken() {
this.fetchTime = Instant.now();
this.fetchTime = now();
}

public AccessToken(String accessToken, String refreshToken, String tokenType, long expiresIn, String scope) {
public AccessToken(String accessToken, String refreshToken, String tokenType, Long expiresIn, String scope) {
this();
this.accessToken = accessToken;
this.refreshToken = refreshToken;
Expand Down Expand Up @@ -69,11 +69,11 @@ public void setTokenType(String tokenType) {
this.tokenType = tokenType;
}

public long getExpiresIn() {
public Long getExpiresIn() {
return expiresIn;
}

public void setExpiresIn(long expiresIn) {
public void setExpiresIn(Long expiresIn) {
this.expiresIn = expiresIn;
}

Expand All @@ -90,8 +90,12 @@ public Instant getFetchTime() {
}

public boolean isExpired() {
final Instant expirationTime = fetchTime.plusSeconds(expiresIn);
return now().isAfter(expirationTime);
if (expiresIn == null) {
return false;
} else {
final Instant expirationTime = fetchTime.plusSeconds(expiresIn);
return now().isAfter(expirationTime);
}
}

Instant now() {
Expand Down
9 changes: 8 additions & 1 deletion ...rvices/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,14 @@ public void testIsExpiredInFiveMinutes() {
assertFalse(accessToken.isExpired());
}

private AccessToken getAccessToken(final long expiresInSeconds) {
@Test
public void testIsExpiredNever() {
final AccessToken accessToken = getAccessToken(null);

assertFalse(accessToken.isExpired());
}

private AccessToken getAccessToken(final Long expiresInSeconds) {
return new AccessToken(
null,
null,
Expand Down
2 changes: 1 addition & 1 deletion ...ider-service/src/main/java/org/apache/nifi/oauth2/JWTBearerOAuth2AccessTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ public AccessToken getAccessDetails() {
}

private boolean isRefreshRequired() {
if (accessDetails.getExpiresIn() > 0) {
if (accessDetails.getExpiresIn() != null) {
final Instant expirationRefreshTime = accessDetails.getFetchTime()
.plusSeconds(accessDetails.getExpiresIn())
.minus(refreshWindow);
Expand Down
14 changes: 9 additions & 5 deletions ...vider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ private void getProperties(ConfigurationContext context) {

AccessToken accessDetailsWithRefreshTokenOnly = new AccessToken();
accessDetailsWithRefreshTokenOnly.setRefreshToken(refreshToken);
accessDetailsWithRefreshTokenOnly.setExpiresIn(-1);
accessDetailsWithRefreshTokenOnly.setExpiresIn(-1L);

this.accessDetails = accessDetailsWithRefreshTokenOnly;
}
Expand Down Expand Up @@ -450,11 +450,15 @@ private void getProperties(ConfigurationContext context) {
}

private boolean isRefreshRequired() {
final Instant expirationRefreshTime = accessDetails.getFetchTime()
.plusSeconds(accessDetails.getExpiresIn())
.minusSeconds(refreshWindowSeconds);
if (accessDetails.getExpiresIn() == null) {
return false;
} else {
final Instant expirationRefreshTime = accessDetails.getFetchTime()
.plusSeconds(accessDetails.getExpiresIn())
.minusSeconds(refreshWindowSeconds);

return Instant.now().isAfter(expirationRefreshTime);
return Instant.now().isAfter(expirationRefreshTime);
}
}

private void acquireAccessDetails() {
Expand Down
Loading