Update download file from shared links

Author: congminh1254

src/main/java/com/box/sdk/BoxFile.java

@@ -359,16 +359,14 @@ public static void downloadFromSharedLink(
     public static void downloadFromSharedLink(
             BoxAPIConnection api, OutputStream output, String sharedLink, String password, ProgressListener listener
     ) {
-        BoxItem.Info item = BoxItem.getSharedItem(api, sharedLink, password, "download_url");
-        URL url;
-        try {
-            url = new URL(item.getDownloadUrl());
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(
-                    String.format("Invalid download URL %s for shared link %s", item.getDownloadUrl(), sharedLink), e
-            );
+        BoxItem.Info item = BoxItem.getSharedItem(api, sharedLink, password, "id");
+        if (!(item instanceof BoxFile.Info)) {
+            throw new BoxAPIException("The shared link provided is not a shared link for a file.");
         }
+        BoxFile sharedFile = new BoxFile(api, item.getID());
+        URL url = sharedFile.getDownloadUrl();
         BoxAPIRequest request = new BoxAPIRequest(api, url, "GET");
+        request.addHeader("BoxApi", BoxSharedLink.getSharedLinkHeaderValue(sharedLink, password));
         BoxAPIResponse response = request.send();
         writeStream(response, output, listener);
     }

src/test/java/com/box/sdk/BoxFileTest.java

@@ -735,36 +735,43 @@ public void createEditableSharedLinkSucceeds() {
     @Test
     public void testDownloadFromSharedLinkWithPassword() {
         final String sharedItemsURL = "/2.0/shared_items";
+        final String fileContentURL = "/2.0/files/12345/content";
         final String sharedLink = "https://app.box.com/s/abcdef123456";
         final String password = "password";
         final byte[] fileContent = "This is a test file content".getBytes();
         final String expectedSharedLinkHeaderValue = "shared_link=" + sharedLink + "&shared_link_password=" + password;
         final String expectedDownloadPath = "/shared/static/rh935iit6ewrmw0unyul.jpeg";
         final String expectedDownloadUrl = format("https://localhost:%d%s", wireMockRule.httpsPort(), expectedDownloadPath);
 
-        String sharedItemsResponse = format(
-                "{ \"download_url\": \"%s\", \"type\": \"file\", \"id\": \"12345\" }",
-                expectedDownloadUrl
-        );
+        String sharedItemsResponse = "{ \"type\": \"file\", \"id\": \"12345\" }";
 
         wireMockRule.stubFor(WireMock.get(WireMock.urlPathEqualTo(sharedItemsURL))
                 .willReturn(WireMock.aResponse()
                         .withHeader("Content-Type", APPLICATION_JSON)
                         .withBody(sharedItemsResponse)));
 
-        wireMockRule.stubFor(WireMock.get(WireMock.urlPathEqualTo(expectedDownloadPath))
+        wireMockRule.stubFor(WireMock.get(WireMock.urlPathEqualTo(fileContentURL))
+                .withHeader("boxapi", WireMock.equalTo(expectedSharedLinkHeaderValue))
                 .willReturn(WireMock.aResponse()
-                        .withHeader("Content-Type", "application/octet-stream")
-                        .withBody(fileContent)));
+                        .withStatus(302)
+                        .withHeader("Location", expectedDownloadUrl)));
+
+        wireMockRule.stubFor(WireMock.get(WireMock.urlPathEqualTo(expectedDownloadPath))
+            .willReturn(WireMock.aResponse()
+                .withHeader("Content-Type", "application/octet-stream")
+                .withBody(fileContent)));
 
 
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         BoxFile.downloadFromSharedLink(api, output, sharedLink, password);
 
         verify(1, getRequestedFor(
-                urlEqualTo("/2.0/shared_items?fields=download_url")).
+                urlEqualTo("/2.0/shared_items?fields=id")).
                 withHeader("BoxApi", WireMock.equalTo(expectedSharedLinkHeaderValue)));
 
+        verify(1, getRequestedFor(urlEqualTo(fileContentURL)).
+            withHeader("boxapi", WireMock.equalTo(expectedSharedLinkHeaderValue)));
+
         verify(1, getRequestedFor(urlEqualTo(expectedDownloadPath)));
 
         assertArrayEquals(fileContent, output.toByteArray());
@@ -773,6 +780,7 @@ public void testDownloadFromSharedLinkWithPassword() {
     @Test
     public void testDownloadFromSharedLinkWithProgressListener() {
         final String sharedItemsURL = "/2.0/shared_items";
+        final String fileContentURL = "/2.0/files/12345/content";
         final String sharedLink = "https://app.box.com/s/abcdef123456";
         final byte[] fileContent = "This is a test file content".getBytes();
         final String expectedSharedLinkHeaderValue = "shared_link=" + sharedLink;
@@ -791,6 +799,12 @@ public void testDownloadFromSharedLinkWithProgressListener() {
                         .withHeader("Content-Type", APPLICATION_JSON)
                         .withBody(sharedItemsResponse)));
 
+        wireMockRule.stubFor(WireMock.get(WireMock.urlPathEqualTo(fileContentURL))
+            .withHeader("boxapi", WireMock.equalTo(expectedSharedLinkHeaderValue))
+            .willReturn(WireMock.aResponse()
+                .withStatus(302)
+                .withHeader("Location", expectedDownloadUrl)));
+
         wireMockRule.stubFor(WireMock.get(WireMock.urlPathEqualTo(expectedDownloadPath))
                 .willReturn(WireMock.aResponse()
                         .withHeader("Content-Type", "application/octet-stream")
@@ -804,9 +818,12 @@ public void testDownloadFromSharedLinkWithProgressListener() {
         BoxFile.downloadFromSharedLink(api, output, sharedLink, listener);
 
         verify(1, getRequestedFor(
-                urlEqualTo("/2.0/shared_items?fields=download_url")).
+                urlEqualTo("/2.0/shared_items?fields=id")).
                 withHeader("BoxApi", WireMock.equalTo(expectedSharedLinkHeaderValue)));
 
+        verify(1, getRequestedFor(urlEqualTo(fileContentURL)).
+                withHeader("boxapi", WireMock.equalTo(expectedSharedLinkHeaderValue)));
+
         verify(1, getRequestedFor(urlEqualTo(expectedDownloadPath)));
 
         assertArrayEquals(fileContent, output.toByteArray());