hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 10:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix request a copy link token generation

Browse Source 
Ensure DSpace URLs with extra segments are included
fully in the generated link

(cherry picked from commit 52702a23df)
This commit is contained in:
Kim Shepherd
2024-06-25 13:45:31 +02:00
committed by github-actions[bot]
parent c70d6dbf2e
commit 5ca9fee2be
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
View File

@@ -21,6 +21,7 @@ import java.util.UUID;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.EmailValidator; import org.apache.commons.validator.routines.EmailValidator;
import org.apache.http.client.utils.URIBuilder; import org.apache.http.client.utils.URIBuilder;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@@ -287,19 +288,17 @@ public class RequestItemRepository
* Generate a link back to DSpace, to act on a request. * Generate a link back to DSpace, to act on a request.
* *
* @param token identifies the request. * @param token identifies the request.
* @return URL to the item request API, with the token as request parameter * @return URL to the item request API, with /request-a-copy/{token} as the last URL segments
* "token".
* @throws URISyntaxException passed through. * @throws URISyntaxException passed through.
* @throws MalformedURLException passed through. * @throws MalformedURLException passed through.
*/ */
private String getLinkTokenEmail(String token) private String getLinkTokenEmail(String token)
throws URISyntaxException, MalformedURLException { throws URISyntaxException, MalformedURLException {
final String base = configurationService.getProperty("dspace.ui.url"); final String base = configurationService.getProperty("dspace.ui.url");
URIBuilder uriBuilder = new URIBuilder(base);
URI link = new URIBuilder(base) // Add request-a-copy/token to the existing path (without breaking /sub/dir dspace URLs)
.setPathSegments("request-a-copy", token) URI uri = uriBuilder.setPath(StringUtils.stripEnd(uriBuilder.getPath(), "")
.build(); + "/request-a-copy/" + token).build();
return uri.toURL().toExternalForm();
return link.toURL().toExternalForm();
} }
} }