Skip to content

reconciliation status: accept moreAttrsToGet also when search by anyKey #239

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

Merged
ilgrosso merged 2 commits into from
Jan 28, 2021
Merged

reconciliation status: accept moreAttrsToGet also when search by anyKey #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e6ad7f
reconciliation status: accept moreAttrsToGet also when search by anyKey
andrea-patricelli Jan 27, 2021
938c4e2
NPE handling
andrea-patricelli Jan 27, 2021
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
9 changes: 7 additions & 2 deletions core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,11 @@ private Any<?> getAny(final Provision provision, final String anyKey) {
}

@PreAuthorize("hasRole('" + StandardEntitlement.RESOURCE_GET_CONNOBJECT + "')")
public ReconStatus status(final String anyTypeKey, final String resourceKey, final String anyKey) {
public ReconStatus status(
final String anyTypeKey,
final String resourceKey,
final String anyKey,
final Set<String> moreAttrsToGet) {
Provision provision = getProvision(anyTypeKey, resourceKey);

MappingItem connObjectKeyItem = MappingUtils.getConnObjectKeyItem(provision).
Expand All @@ -237,7 +241,8 @@ public ReconStatus status(final String anyTypeKey, final String resourceKey, fin
status.setOnSyncope(getOnSyncope(any, connObjectKeyItem, provision));

List<ConnectorObject> connObjs = outboundMatcher.match(
connFactory.getConnector(provision.getResource()), any, provision, Optional.empty());
connFactory.getConnector(provision.getResource()), any, provision,
Optional.of(moreAttrsToGet.toArray(new String[] {})));
if (!connObjs.isEmpty()) {
status.setOnResource(ConnObjectUtils.getConnObjectTO(
outboundMatcher.getFIQL(connObjs.get(0), provision), connObjs.get(0).getAttributes()));
Expand Down
4 changes: 3 additions & 1 deletion ...cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Optional;
import javax.validation.ValidationException;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
Expand Down Expand Up @@ -98,7 +99,8 @@ public ReconStatus status(final ReconQuery query) {
validate(query);

if (query.getAnyKey() != null) {
return logic.status(query.getAnyTypeKey(), query.getResourceKey(), query.getAnyKey());
return logic.status(query.getAnyTypeKey(), query.getResourceKey(), query.getAnyKey(),
Optional.ofNullable(query.getMoreAttrsToGet()).orElse(new HashSet<>()));
}

Pair<Filter, Set<String>> fromFIQL = buildFromFIQL(query);
Expand Down