Skip to content

SWI-11878 Add Null Guard Clause to OAuth #253

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
ckoegel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

SWI-11878 Add Null Guard Clause to OAuth #253

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
2ef393c
SWI-11878 Add Null Guard Clause to OAuth
ckoegel Aug 4, 2026
a883680
checkout versions
ckoegel Aug 4, 2026
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 .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ jobs:
run: echo "RELEASE_VERSION=${TAG#v}" >> $GITHUB_ENV
env:
TAG: ${{ github.event.release.tag_name }}

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up Apache Maven Central
uses: actions/setup-java@v5
with:
distribution: 'adopt'
distribution: "adopt"
java-version: 21
server-id: 'ossrh'
server-id: "ossrh"
server-username: PUBLISHER_USERNAME
server-password: PUBLISHER_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true


env:
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
Expand Down Expand Up @@ -43,7 +42,7 @@ jobs:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up JDK
uses: actions/setup-java@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-smoke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up JDK
uses: actions/setup-java@v5
Expand Down
8 changes: 6 additions & 2 deletions custom_templates/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import okhttp3.MediaType;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;

import org.apache.oltu.oauth2.client.HttpClient;
import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
Expand Down Expand Up @@ -56,9 +57,12 @@ public class OAuthOkHttpClient implements HttpClient {

try {
Response response = client.newCall(requestBuilder.build()).execute();
ResponseBody responseBody = response.body();
// A degraded auth response (e.g. rate limited) can have no body or no Content-Type
MediaType responseMediaType = responseBody != null ? responseBody.contentType() : null;
return OAuthClientResponseFactory.createCustomResponse(
response.body().string(),
response.body().contentType().toString(),
responseBody != null ? responseBody.string() : "",
responseMediaType != null ? responseMediaType.toString() : null,
response.code(),
response.headers().toMultimap(),
responseClass);
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/bandwidth/sdk/auth/OAuthOkHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;

import org.apache.oltu.oauth2.client.HttpClient;
import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
Expand Down Expand Up @@ -66,9 +67,12 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map

try {
Response response = client.newCall(requestBuilder.build()).execute();
ResponseBody responseBody = response.body();
// A degraded auth response (e.g. rate limited) can have no body or no Content-Type
MediaType responseMediaType = responseBody != null ? responseBody.contentType() : null;
return OAuthClientResponseFactory.createCustomResponse(
response.body().string(),
response.body().contentType().toString(),
responseBody != null ? responseBody.string() : "",
responseMediaType != null ? responseMediaType.toString() : null,
response.code(),
response.headers().toMultimap(),
responseClass);
Expand Down