Skip to content

Jersey2/3: Fixes a bug in OAuth token renewal, where the previous HTTP 401 code is reused even after the retry succeeds #22134

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

Merged
merged 2 commits into from
Oct 16, 2025
Merged

Jersey2/3: Fixes a bug in OAuth token renewal, where the previous HTTP 401 code is reused even after the retry succeeds #22134

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
497170a
Jersey2/3: Fix a bug where, when using OAuth, the HTTP 401 status cod…
jheyens Oct 14, 2025
42f5bef
Jersey2/3: Regenerate samples
jheyens Oct 14, 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
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,11 +1299,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

{{#hasOAuthMethods}}
// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1317,8 +1315,10 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
}
}
}

{{/hasOAuthMethods}}
final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

if (statusCode == Status.NO_CONTENT.getStatusCode()) {
Expand Down
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,11 +1299,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

{{#hasOAuthMethods}}
// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1319,6 +1317,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
}

{{/hasOAuthMethods}}
final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

if (statusCode == Status.NO_CONTENT.getStatusCode()) {
Expand Down
6 changes: 3 additions & 3 deletions ...ore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,10 +1213,8 @@ public <T> ApiResponse<T> invokeAPI(
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1230,6 +1228,8 @@ public <T> ApiResponse<T> invokeAPI(
}
}
}

final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

Expand Down
6 changes: 3 additions & 3 deletions ...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,10 +1213,8 @@ public <T> ApiResponse<T> invokeAPI(
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1230,6 +1228,8 @@ public <T> ApiResponse<T> invokeAPI(
}
}
}

final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,10 +1295,8 @@ public <T> ApiResponse<T> invokeAPI(
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1313,6 +1311,8 @@ public <T> ApiResponse<T> invokeAPI(
}
}

final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

if (statusCode == Status.NO_CONTENT.getStatusCode()) {
Expand Down
6 changes: 3 additions & 3 deletions ...petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,10 +1197,8 @@ public <T> ApiResponse<T> invokeAPI(
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1214,6 +1212,8 @@ public <T> ApiResponse<T> invokeAPI(
}
}
}

final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

Expand Down
6 changes: 3 additions & 3 deletions ...petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,10 +1197,8 @@ public <T> ApiResponse<T> invokeAPI(
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1214,6 +1212,8 @@ public <T> ApiResponse<T> invokeAPI(
}
}
}

final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

Expand Down
6 changes: 3 additions & 3 deletions ...3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,10 +1295,8 @@ public <T> ApiResponse<T> invokeAPI(
try {
response = sendRequest(method, invocationBuilder, entity);

final int statusCode = response.getStatusInfo().getStatusCode();

// If OAuth is used and a status 401 is received, renew the access token and retry the request
if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) {
if (authNames != null && response.getStatusInfo().getStatusCode() == Status.UNAUTHORIZED.getStatusCode()) {
for (String authName : authNames) {
Authentication authentication = authentications.get(authName);
if (authentication instanceof OAuth) {
Expand All @@ -1312,6 +1310,8 @@ public <T> ApiResponse<T> invokeAPI(
}
}
}

final int statusCode = response.getStatusInfo().getStatusCode();

Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

Expand Down
Loading