Skip to content
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

Jump to bottom

adds shared link downscoping and coverage #785

Merged
merged 11 commits into from
Jun 15, 2020
Merged

adds shared link downscoping and coverage #785

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e6b8e72
adds shared link downscoping and coverage
boxdave Mar 23, 2020
54bdc16
adds helper for api vs. shared link url. tests failing
boxdave Mar 29, 2020
1429f7f
git ignore config.json
boxdave Apr 3, 2020
21540ee
unit tests passing. integration failing
boxdave Apr 3, 2020
d680ac0
integration test BoxAPIConnectionTest.getLowerScopedTokenWorks failing
boxdave Apr 3, 2020
b93682e
adds method for building scopes list. tests passing
boxdave Apr 7, 2020
f7e06e0
Apply suggestions from code review
PJSimon Jun 4, 2020
950d94a
Merge branch 'master' into feature/shared-link-downscoping
PJSimon Jun 12, 2020
b250642
Add enum type, update tests, refactoring
PJSimon Jun 13, 2020
2a2f0d4
Fix test
PJSimon Jun 15, 2020
dbbca4b
Fix test
PJSimon Jun 15, 2020
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
23 changes: 13 additions & 10 deletions 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 @@ -677,7 +677,7 @@ public void setRequestInterceptor(RequestInterceptor interceptor) {
* @param resource the resource for which the new token has to be obtained
PJSimon marked this conversation as resolved.
Show resolved Hide resolved
* @return scopedToken which has access token and other details
*/
public ScopedToken getLowerScopedToken(List<String> scopes, String resource) {
public ScopedToken getLowerScopedToken(List<String> scopes, String resource, String sharedLink) {
PJSimon marked this conversation as resolved.
Show resolved Hide resolved
assert (scopes != null);
assert (scopes.size() > 0);
URL url = null;
Expand All @@ -698,18 +698,21 @@ public ScopedToken getLowerScopedToken(List<String> scopes, String resource) {

String urlParameters = null;

if (resource != null) {
//this.getAccessToken() ensures we have a valid access token
if (resource == null && sharedLink == null) {
urlParameters = String.format("grant_type=urn:ietf:params:oauth:grant-type:token-exchange"
+ "&subject_token_type=urn:ietf:params:oauth:token-type:access_token&subject_token=%s"
+ "&scope=%s&resource=%s",
this.getAccessToken(), spaceSeparatedScopes, resource);
+ "&subject_token_type=urn:ietf:params:oauth:token-type:access_token&subject_token=%s"
+ "&scope=%s",
this.getAccessToken(), spaceSeparatedScopes);
} else if (resource != null) {
urlParameters = String.format("grant_type=urn:ietf:params:oauth:grant-type:token-exchange"
+ "&subject_token_type=urn:ietf:params:oauth:token-type:access_token&subject_token=%s"
+ "&scope=%s&resource=%s",
this.getAccessToken(), spaceSeparatedScopes, resource);
} else {
//this.getAccessToken() ensures we have a valid access token
urlParameters = String.format("grant_type=urn:ietf:params:oauth:grant-type:token-exchange"
+ "&subject_token_type=urn:ietf:params:oauth:token-type:access_token&subject_token=%s"
+ "&scope=%s",
this.getAccessToken(), spaceSeparatedScopes);
+ "&subject_token_type=urn:ietf:params:oauth:token-type:access_token&subject_token=%s"
+ "&scope=%s&box_shared_link=%s",
this.getAccessToken(), spaceSeparatedScopes, sharedLink);
}

BoxAPIRequest request = new BoxAPIRequest(this, url, "POST");
Expand Down
49 changes: 33 additions & 16 deletions src/test/java/com/box/sdk/BoxAPIConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,48 +569,65 @@ public void getLowerScopedTokenRefreshesTheTokenIfNeededbyCallingGetAccessToken(
List<String> scopes = new ArrayList<String>();
scopes.add("DummyScope");
String resource = "";
String sharedLink = null;

when(api.getTokenURL()).thenReturn("https://api.box.com/oauth2/token");
when(api.getLowerScopedToken(scopes, resource)).thenCallRealMethod();
when(api.getLowerScopedToken(scopes, resource, sharedLink)).thenCallRealMethod();
PJSimon marked this conversation as resolved.
Show resolved Hide resolved
try {
api.getLowerScopedToken(scopes, resource);
api.getLowerScopedToken(scopes, resource, sharedLink);
PJSimon marked this conversation as resolved.
Show resolved Hide resolved
} catch (RuntimeException e) {
//Ignore it
}
verify(api).getAccessToken();
}

@Test
@Category(UnitTest.class)
public void getLowerScopedTokenWithNullResource() {
BoxAPIConnection api = mock(BoxAPIConnection.class);
@Category(IntegrationTest.class)
public void getLowerScopedToken() {
final String originalAccessToken = TestConfig.getAccessToken();
BoxAPIConnection api = new BoxAPIConnection(originalAccessToken);

List<String> scopes = new ArrayList<String>();
scopes.add("DummyScope");
scopes.add("item_preview");
scopes.add("item_content_upload");
String resource = null;
String sharedLink = null;

when(api.getTokenURL()).thenReturn("https://api.box.com/oauth2/token");
when(api.getLowerScopedToken(scopes, resource)).thenCallRealMethod();
try {
api.getLowerScopedToken(scopes, resource);
} catch (RuntimeException e) {
//Ignore it
}
verify(api).getAccessToken();
ScopedToken token = api.getLowerScopedToken(scopes, resource, sharedLink);
assertThat(token, notNullValue());
assertThat(token.getAccessToken(), notNullValue());
}

@Test
@Category(IntegrationTest.class)
public void getLowerScopedTokenWorks() {
public void getLowerScopedTokenForResource() {
PJSimon marked this conversation as resolved.
Show resolved Hide resolved
final String originalAccessToken = TestConfig.getAccessToken();
BoxAPIConnection api = new BoxAPIConnection(originalAccessToken);

List<String> scopes = new ArrayList<String>();
scopes.add("item_preview");
scopes.add("item_content_upload");
String resource = "https://api.box.com/2.0/files/135906984991";
String sharedLink = null;

ScopedToken token = api.getLowerScopedToken(scopes, resource, sharedLink);
assertThat(token, notNullValue());
assertThat(token.getAccessToken(), notNullValue());
}

@Test
@Category(IntegrationTest.class)
public void getLowerScopedTokenForSharedLink() {
final String originalAccessToken = TestConfig.getAccessToken();
BoxAPIConnection api = new BoxAPIConnection(originalAccessToken);

List<String> scopes = new ArrayList<String>();
scopes.add("item_preview");
scopes.add("item_content_upload");
String resource = null;
String sharedLink = null;

ScopedToken token = api.getLowerScopedToken(scopes, resource);
ScopedToken token = api.getLowerScopedToken(scopes, resource, sharedLink);
assertThat(token, notNullValue());
assertThat(token.getAccessToken(), notNullValue());
}
Expand Down