Skip to content

Commit ac3c5fc

Browse files
authored
Merge pull request #11727 from IQSS/11726-remove-unused-code
#11726 remove bypassAccessCheck
2 parents 04ad1a6 + 4c40b05 commit ac3c5fc

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

src/main/java/edu/harvard/iq/dataverse/api/Datasets.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3278,10 +3278,9 @@ private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req,
32783278
final Dataset ds,
32793279
UriInfo uriInfo,
32803280
HttpHeaders headers) throws WrappedResponse {
3281-
//The checkPerms was added to check the permissions ONLY when the dataset is deaccessioned.
3282-
boolean checkFilePerms = false;
3281+
boolean checkPermsWhenDeaccessioned = false;
32833282
boolean includeDeaccessioned = false;
3284-
return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkFilePerms);
3283+
return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkPermsWhenDeaccessioned);
32853284
}
32863285

32873286
/*
@@ -3290,25 +3289,15 @@ private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req,
32903289
private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req, String versionNumber, final Dataset ds,
32913290
UriInfo uriInfo, HttpHeaders headers, boolean includeDeaccessioned) throws WrappedResponse {
32923291
boolean checkPermsWhenDeaccessioned = true;
3293-
boolean bypassAccessCheck = false;
3294-
return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkPermsWhenDeaccessioned, bypassAccessCheck);
3292+
return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkPermsWhenDeaccessioned);
32953293
}
32963294

3297-
/*
3298-
* checkPermsWhenDeaccessioned default to true. Be aware that the version will be only be obtainable if the user has edit permissions.
3299-
*/
3300-
private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req, String versionNumber, final Dataset ds,
3301-
UriInfo uriInfo, HttpHeaders headers, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned) throws WrappedResponse {
3302-
boolean bypassAccessCheck = false;
3303-
return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkPermsWhenDeaccessioned, bypassAccessCheck);
3304-
}
33053295

33063296
/*
33073297
* Will allow to define when the permissions should be checked when a deaccesioned dataset is requested. If the user doesn't have edit permissions will result in an error.
33083298
*/
33093299
private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req, String versionNumber, final Dataset ds,
3310-
UriInfo uriInfo, HttpHeaders headers, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned,
3311-
boolean bypassAccessCheck)
3300+
UriInfo uriInfo, HttpHeaders headers, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned)
33123301
throws WrappedResponse {
33133302

33143303
DatasetVersion dsv = findDatasetVersionOrDie(req, versionNumber, ds, includeDeaccessioned, checkPermsWhenDeaccessioned);

0 commit comments

Comments
 (0)