Skip to content

[Port to dtq-dev] Issue 1339: fixed NPE when hidden item metadata are checked for the item with deleted submitter #1290

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

Open
kosarko wants to merge 1 commit into
base: dtq-dev
Choose a base branch
from
Open

[Port to dtq-dev] Issue 1339: fixed NPE when hidden item metadata are checked for the item with deleted submitter #1290

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
11 changes: 7 additions & 4 deletions dspace-api/src/main/java/org/dspace/app/util/MetadataExposureServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.services.ConfigurationService;
import org.springframework.beans.factory.annotation.Autowired;

Expand Down Expand Up @@ -117,10 +118,12 @@ public boolean isHidden(Context context, String schema, String element, String q
}

// The user is not administrator, but he could be a submitter
if (hidden && Objects.nonNull(context) && Objects.nonNull(item) &&
this.submitterShouldSee(schema, element, qualifier)) {
// the submitters override
hidden = !item.getSubmitter().equals(context.getCurrentUser());
if (hidden && Objects.nonNull(context) && Objects.nonNull(item)) {
EPerson submitter = item.getSubmitter();
if (Objects.nonNull(submitter) && this.submitterShouldSee(schema, element, qualifier)) {
// the submitters override
hidden = !submitter.equals(context.getCurrentUser());
}
}

return hidden;
Expand Down
13 changes: 13 additions & 0 deletions dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5102,6 +5102,19 @@ public void submitterShouldSeeLocalNoteMetadata() throws Exception {
.andExpect(jsonPath("$", HalMatcher.matchNoEmbeds()))
.andExpect(jsonPath("$", existNoteLocalMetadataMatcher))
.andExpect(jsonPath("$", existDescriptionProvenanceMetadataMatcher));

// After the submitter is deleted, the response for the request made using the previously issued submitter
// token (which now authenticates as anonymous) should not contain
// `local.submission.note` and `dc.description.provenance` metadata
context.turnOffAuthorisationSystem();
EPersonBuilder.deleteEPerson(submitter.getID());
context.restoreAuthSystemState();

getClient(submitterToken).perform(get("/api/core/items/" + publicItem.getID()))
.andExpect(status().isOk())
.andExpect(jsonPath("$", HalMatcher.matchNoEmbeds()))
.andExpect(jsonPath("$", notExistNoteLocalMetadataMatcher))
.andExpect(jsonPath("$", notExistDescriptionProvenanceMetadataMatcher));
}

/**
Expand Down
Loading