ZCU-PUB/SWORDv2 the swordv2 url is not composed correctly (#931)

* Removed `swordv2` duplicities from the `edit-media` request

* Compose correctly the swordBaseUrl when the `path` is empty

* Added better doc

Author: milanmajchrak

dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java

@@ -14,9 +14,11 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.nio.file.Path;
+import java.sql.SQLException;
 import java.util.List;
 
 import org.dspace.app.rest.test.AbstractWebClientIntegrationTest;
+import org.dspace.authorize.AuthorizeException;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.ItemBuilder;
@@ -228,6 +230,84 @@ public void depositItemWithEmbargo() throws Exception {
         assertEquals(ATOM_ENTRY_CONTENT_TYPE, response.getHeaders().getContentType().toString());
     }
 
+    // Test when the `swordv2-server.url` is null. The swordv2 server URL should be constructed using the default value
+    @Test
+    public void editMediaPathTest() throws SQLException, AuthorizeException {
+        context.turnOffAuthorisationSystem();
+        // The `swordv2` server URL is constructed, and the default value is used if `swordv2-server.url` is null.
+        configurationService.setProperty("swordv2-server.url", null);
+        // The `dspace.server.url` must be updated following the same logic as the `swordv2-server.url`.
+        // The `getURL` method used a specific port.
+        String dspaceServerUrl = configurationService.getProperty("dspace.server.url");
+        configurationService.setProperty("dspace.server.url", getURL(""));
+        try {
+            // Create a top level community and one Collection
+            parentCommunity = CommunityBuilder.createCommunity(context)
+                    .withName("Parent Community")
+                    .build();
+            // Make sure our Collection allows the "eperson" user to submit into it
+            Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+                    .withName("Test SWORDv2 Collection")
+                    .withSubmitterGroup(eperson)
+                    .build();
+            // Above changes MUST be committed to the database for SWORDv2 to see them.
+            context.commit();
+            context.restoreAuthSystemState();
+
+            // Add file
+            LinkedMultiValueMap<Object, Object> multipart = new LinkedMultiValueMap<>();
+            multipart.add("file", new FileSystemResource(Path.of("src", "test", "resources",
+                    "org", "dspace", "app", "sword2", "example.zip")));
+            // Add required headers
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+            headers.setContentDisposition(ContentDisposition.attachment().filename("example.zip").build());
+            headers.set("Packaging", "http://purl.org/net/sword/package/METSDSpaceSIP");
+            headers.setAccept(List.of(MediaType.APPLICATION_ATOM_XML));
+
+            //----
+            // STEP 1: Verify upload/submit via SWORDv2 works
+            //----
+            // Send POST to upload Zip file via SWORD
+            ResponseEntity<String> response = postResponseAsString(COLLECTION_PATH + "/" + collection.getHandle(),
+                    eperson.getEmail(), password,
+                    new HttpEntity<>(multipart, headers));
+
+            // Expect a 201 CREATED response with ATOM "entry" content returned
+            assertEquals(HttpStatus.CREATED, response.getStatusCode());
+            assertEquals(ATOM_ENTRY_CONTENT_TYPE, response.getHeaders().getContentType().toString());
+            // MUST return a "Location" header which is the "/swordv2/edit/[uuid]" URI of the created item
+            assertNotNull(response.getHeaders().getLocation());
+
+            String editLink = response.getHeaders().getLocation().toString();
+
+            // Body should include that link as the rel="edit" URL
+            assertThat(response.getBody(), containsString("<link href=\"" + editLink + "\" rel=\"edit\"/>"));
+
+            //----
+            // STEP 2: Verify uploaded content can be read via SWORDv2
+            //----
+            // Edit URI should work when requested by the EPerson who did the deposit
+            HttpHeaders authHeaders = new HttpHeaders();
+            authHeaders.setBasicAuth(eperson.getEmail(), password);
+            RequestEntity request = RequestEntity.get(editLink)
+                    .accept(MediaType.valueOf("application/atom+xml"))
+                    .headers(authHeaders)
+                    .build();
+            response = responseAsString(request);
+            // Expect a 200 response with ATOM feed content returned
+            assertEquals(HttpStatus.OK, response.getStatusCode());
+            assertEquals(ATOM_FEED_CONTENT_TYPE, response.getHeaders().getContentType().toString());
+            // Body should include links to bitstreams from the zip.
+            // This just verifies at least one /swordv2/edit-media/bitstream/* link exists.
+            assertThat(response.getBody(), containsString(getURL(MEDIA_RESOURCE_PATH + "/bitstream")));
+            // Verify Item title also is returned in the body
+            assertThat(response.getBody(), containsString("Attempts to detect retrotransposition"));
+        } finally {
+            configurationService.setProperty("dspace.server.url", dspaceServerUrl);
+        }
+    }
+
     /**
      * This tests four different SWORDv2 actions, as these all require starting with a new deposit.
      * 1. Depositing a new item via SWORD (via POST /collections/[collection-uuid])

dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java

@@ -13,6 +13,7 @@
 import java.util.List;
 
 import org.apache.abdera.i18n.iri.IRI;
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
@@ -109,7 +110,7 @@ public String getSwordBaseUrl()
                     "Unable to construct service document urls, due to missing/invalid " +
                         "config in sword2.url and/or dspace.server.url");
             }
-            sUrl = buildSWORDUrl("swordv2");
+            sUrl = buildSWORDUrl("");
         }
         return sUrl;
     }
@@ -496,6 +497,6 @@ public IRI getMediaFeedUrl(Item item)
      * @return a sword URL
      */
     private String buildSWORDUrl(String path) {
-        return dspaceUrl + "/" + swordPath + "/" + path;
+        return dspaceUrl + "/" + swordPath + (StringUtils.isNotBlank(path) ? "/" + path : "");
     }
 }