Skip to content

fix: Fixed restoring state when refresh token is missing. Added tests for interceptors. #1125

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
antusus merged 1 commit into from
Nov 22, 2022
Merged

fix: Fixed restoring state when refresh token is missing. Added tests for interceptors. #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 12 additions & 41 deletions src/intTest/java/com/box/sdk/BoxAPIConnectionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,78 +33,49 @@ public void requestIsSentNormallyWhenInterceptorReturnsNullResponse() throws Mal
}

@Test
@Ignore("Need to configure access and refresh token")
public void refreshSucceeds() {
final String originalAccessToken = TestConfig.getAccessToken();
final String originalRefreshToken = TestConfig.getRefreshToken();
BoxAPIConnection api = new BoxAPIConnection(TestConfig.getClientID(), TestConfig.getClientSecret(),
originalAccessToken, originalRefreshToken);
BoxAPIConnection api = jwtApiForServiceAccount();
String originalAccessToken = api.getAccessToken();

api.refresh();

String actualAccessToken = api.getAccessToken();
String actualRefreshToken = api.getRefreshToken();

assertThat(originalRefreshToken, not(equalTo(actualRefreshToken)));
assertThat(originalAccessToken, not(equalTo(actualAccessToken)));

TestConfig.setAccessToken(actualAccessToken);
TestConfig.setRefreshToken(actualRefreshToken);
}

@Test
@Ignore("Need to configure access and refresh token")
public void refreshesWhenGetAccessTokenIsCalledAndTokenHasExpired() {
final String originalAccessToken = TestConfig.getAccessToken();
final String originalRefreshToken = TestConfig.getRefreshToken();
BoxAPIConnection api = new BoxAPIConnection(TestConfig.getClientID(), TestConfig.getClientSecret(),
originalAccessToken, originalRefreshToken);
BoxAPIConnection api = jwtApiForServiceAccount();
String originalAccessToken = api.getAccessToken();
api.setExpires(-1);

String actualAccessToken = api.getAccessToken();
String actualRefreshToken = api.getRefreshToken();

assertThat(originalRefreshToken, not(equalTo(actualRefreshToken)));
assertThat(originalAccessToken, not(equalTo(actualAccessToken)));

TestConfig.setAccessToken(actualAccessToken);
TestConfig.setRefreshToken(actualRefreshToken);
}

@Test
@Ignore("Need to configure access and refresh token")
public void doesNotRefreshWhenGetAccessTokenIsCalledAndTokenHasNotExpired() {
final String originalAccessToken = TestConfig.getAccessToken();
final String originalRefreshToken = TestConfig.getRefreshToken();
BoxAPIConnection api = new BoxAPIConnection(TestConfig.getClientID(), TestConfig.getClientSecret(),
originalAccessToken, originalRefreshToken);
BoxAPIConnection api = jwtApiForServiceAccount();
String originalAccessToken = api.getAccessToken();
api.setExpires(Long.MAX_VALUE);

String actualAccessToken = api.getAccessToken();
String actualRefreshToken = api.getRefreshToken();

assertThat(originalRefreshToken, equalTo(actualRefreshToken));
assertThat(originalAccessToken, equalTo(actualAccessToken));

TestConfig.setAccessToken(actualAccessToken);
TestConfig.setRefreshToken(actualRefreshToken);
}

@Test
@Ignore("Need to configure access and refresh token")
public void successfullySavesAndRestoresConnection() {
final String originalAccessToken = TestConfig.getAccessToken();
final String originalRefreshToken = TestConfig.getRefreshToken();
BoxAPIConnection api = new BoxAPIConnection(TestConfig.getClientID(), TestConfig.getClientSecret(),
originalAccessToken, originalRefreshToken);
BoxAPIConnection api = jwtApiForServiceAccount();
String state = api.save();
BoxConfig boxConfig = jwtBoxConfig();

BoxAPIConnection restoredAPI = BoxAPIConnection.restore(TestConfig.getClientID(), TestConfig.getClientSecret(),
state);
BoxFolder.getRootFolder(restoredAPI).getInfo();

TestConfig.setAccessToken(restoredAPI.getAccessToken());
TestConfig.setRefreshToken(restoredAPI.getRefreshToken());
BoxAPIConnection restoredAPI = BoxAPIConnection.restore(
boxConfig.getClientId(), boxConfig.getClientSecret(), state
);
assertThat(BoxFolder.getRootFolder(restoredAPI).getInfo().getID(), is("0"));
}

@Test
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/box/sdk/BoxAPIConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,9 @@ public void refresh() {
public void restore(String state) {
JsonObject json = Json.parse(state).asObject();
String accessToken = json.get("accessToken").asString();
String refreshToken = json.get("refreshToken").asString();
String refreshToken = Optional.ofNullable(json.get("refreshToken"))
.map(v -> v.isNull() ? null : v.asString())
.orElse(null);
long lastRefresh = json.get("lastRefresh").asLong();
long expires = json.get("expires").asLong();
String userAgent = json.get("userAgent").asString();
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/com/box/sdk/BoxAPIRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static com.box.sdk.http.ContentType.APPLICATION_JSON;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.matching;
Expand Down Expand Up @@ -234,6 +235,23 @@ public void willNotRetry400ErrorWithJsonResponse() {
}
}

@Test
public void interceptorCanModifyRequest() {
String headerName = "XX-My-Custom-Header";
String headerValue = "some value";
stubFor(get(urlEqualTo("/")).withHeader(headerName, equalTo(headerValue))
.willReturn(aResponse().withStatus(200).withBody("{\"foo\":\"bar\"}")));

BoxAPIConnection api = new BoxAPIConnection("");
api.setRequestInterceptor(request -> {
request.addHeader(headerName, headerValue);
return null;
});

new BoxAPIRequest(api, boxMockUrl(), "GET").send();
verify(1, getRequestedFor(urlEqualTo("/")));
}

private byte[] gzipped(String str) {
try {
ByteArrayOutputStream obj = new ByteArrayOutputStream();
Expand Down