Skip to content

Commit

Permalink
multiple recovered users displaying when itemToDisplay is configured
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Aug 20, 2023
1 parent 01bc206 commit 5c204a3
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 56 deletions.
14 changes: 8 additions & 6 deletions .../src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
<div class="text-lg" wicket:id="loginName"/>
</div>
</div>
</div>
<div class="d-flex flex-column justify-content-start mt-5 col-12">
<div wicket:id="configuredItemsPanel" class="d-flex my-2 justify-content-start">
<label class="col-md-5" wicket:id="itemName"></label>
<div type="text" wicket:id="itemValue"/>
</div>
<wicket:enclosure child="configuredItemsPanel">
<div class="user-panel info-box d-flex flex-column justify-content-start mt-5 col-12">
<div wicket:id="configuredItemsPanel" class="d-flex justify-content-start">
<label class="col-md-5" wicket:id="itemName"></label>
<div wicket:id="itemValue"/>
</div>
</div>
</wicket:enclosure>
</div>
</wicket:extend>

Expand Down
95 changes: 51 additions & 44 deletions .../src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import com.evolveum.midpoint.prism.ItemDefinition;
import com.evolveum.midpoint.schema.result.OperationResult;

import com.evolveum.midpoint.util.Producer;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;

import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;

Expand Down Expand Up @@ -99,22 +99,16 @@ protected void initCustomLayout() {
ListView<UserType> recoveredIdentitiesPanel = new ListView<>(ID_RECOVERED_IDENTITIES, recoveredIdentitiesModel) {
@Override
protected void populateItem(ListItem<UserType> item) {
WebMarkupContainer loginNamePanel = new WebMarkupContainer(ID_LOGIN_NAME_PANEL);
loginNamePanel.setOutputMarkupId(true);
// loginNamePanel.add(new VisibleBehaviour(() -> isSingleRecoveredIdentity() && !configuredItemsExist()));
item.add(loginNamePanel);

NonCachingImage img = new NonCachingImage(ID_PHOTO, getImageResource(item.getModelObject()));
loginNamePanel.add(img);

Label label = new Label(ID_LOGIN_NAME, getAuthorizedUserLoginNameModel(item.getModelObject()));
loginNamePanel.add(label);
initRecoveredIdentitiesPanel(item);
}
};
recoveredIdentitiesPanel.setOutputMarkupId(true);
add(recoveredIdentitiesPanel);
}

initConfiguredItemsPanel();
private void initRecoveredIdentitiesPanel(ListItem<UserType> item) {
initLoginNamePanel(item);
initConfiguredItemsPanel(item);
}

private void initModels() {
Expand All @@ -137,29 +131,26 @@ protected List<ItemPathType> load() {
}

private List<ItemPathType> loadConfiguredItemPathList() {
List<ItemPathType> configuredItems = new ArrayList<>();
var archetypeOid = getMidpointAuthentication().getArchetypeOid();
return runPrivileged((Producer<List<ItemPathType>>) () -> {
List<ItemPathType> configuredItems = new ArrayList<>();

if (!isSingleRecoveredIdentity()) {
var task = createAnonymousTask(OPERATION_GET_SECURITY_POLICY);
var result = new OperationResult(OPERATION_GET_SECURITY_POLICY);
try {
var securityPolicy = getModelInteractionService().getSecurityPolicy(new UserType().asPrismObject(), archetypeOid,
task, result);
var identityRecoveryConfig = securityPolicy.getIdentityRecovery();
configuredItems = identityRecoveryConfig.getItemToDisplay();
} catch (Exception e) {
LOGGER.debug("Unable to load the configured items list for identity recovery page, ", e);
}
return configuredItems;
}

var user = getRecoveredIdentities().get(0);
var task = createSimpleTask(OPERATION_GET_SECURITY_POLICY);
var result = new OperationResult(OPERATION_GET_SECURITY_POLICY);
try {
var securityPolicy = getModelInteractionService().getSecurityPolicy(user.asPrismObject(),
getMidpointAuthentication().getArchetypeOid(), task, result);
var identityRecoveryConfig = securityPolicy.getIdentityRecovery();
configuredItems = identityRecoveryConfig.getItemToDisplay();
} catch (Exception e) {
LOGGER.debug("Unable to load the configured items list for login recovery page, ", e);
}
return configuredItems;
});
}

private boolean configuredItemsExist() {
return false; //todo fix
// return configuredItemsModel != null && CollectionUtils.isNotEmpty(configuredItemsModel.getObject());
return configuredItemsModel != null && CollectionUtils.isNotEmpty(configuredItemsModel.getObject());
}

private AbstractResource getImageResource(UserType user) {
Expand All @@ -181,40 +172,56 @@ private AbstractResource getImageResource(UserType user) {
return new ByteArrayResource("image/jpeg", photo);
}

private IModel<String> getAuthorizedUserLoginNameModel(UserType user) {
private void initLoginNamePanel(ListItem<UserType> item) {
WebMarkupContainer loginNamePanel = new WebMarkupContainer(ID_LOGIN_NAME_PANEL);
loginNamePanel.setOutputMarkupId(true);
loginNamePanel.add(new VisibleBehaviour(() -> recoveredIdentitiesExist() && !configuredItemsExist()));
item.add(loginNamePanel);

NonCachingImage img = new NonCachingImage(ID_PHOTO, getImageResource(item.getModelObject()));
loginNamePanel.add(img);

Label label = new Label(ID_LOGIN_NAME, getUserLoginNameModel(item.getModelObject()));
loginNamePanel.add(label);
}

private IModel<String> getUserLoginNameModel(UserType user) {
return Model.of(LocalizationUtil.translatePolyString(user.getName()));
}

private void initConfiguredItemsPanel() {
private void initConfiguredItemsPanel(ListItem<UserType> userItem) {
var user = userItem.getModelObject();
ListView<ItemPathType> configuredItemsPanel = new ListView<>(ID_CONFIGURED_ITEMS_PANEL, configuredItemsModel) {

@Serial private static final long serialVersionUID = 1L;

@Override
protected void populateItem(ListItem<ItemPathType> item) {
Label itemName = new Label(ID_ITEM_NAME, resolveItemName(item.getModelObject()));
item.add(itemName);

Label itemValue = new Label(ID_ITEM_VALUE, resolveItemValue(item.getModelObject()));
item.add(itemValue);
protected void populateItem(ListItem<ItemPathType> attributeItem) {
Label itemName = new Label(ID_ITEM_NAME, resolveItemName(user, attributeItem.getModelObject()));
itemName.setOutputMarkupId(true);
attributeItem.add(itemName);

Label itemValue = new Label(ID_ITEM_VALUE, resolveItemValue(user, attributeItem.getModelObject()));
itemValue.setOutputMarkupId(true);
attributeItem.add(itemValue);
}
};
configuredItemsPanel.setOutputMarkupId(true);
configuredItemsPanel.add(new VisibleBehaviour(() -> recoveredIdentitiesExist() && configuredItemsExist()));
add(configuredItemsPanel);
userItem.add(configuredItemsPanel);
}

private IModel<String> resolveItemName(ItemPathType itemPath) {
private IModel<String> resolveItemName(UserType user, ItemPathType itemPath) {
return () -> {
ItemDefinition<?> def = new UserType().asPrismObject().getDefinition().findItemDefinition(itemPath.getItemPath());
ItemDefinition<?> def = user.asPrismObject().getDefinition().findItemDefinition(itemPath.getItemPath());
return WebComponentUtil.getItemDefinitionDisplayNameOrName(def);
};
}

private IModel<String> resolveItemValue(ItemPathType itemPath) {
private IModel<String> resolveItemValue(UserType user, ItemPathType itemPath) {
return () -> {
FocusType focus = getPrincipalFocus();
var value = focus.asPrismObject().findItem(itemPath.getItemPath()).getRealValue();
var item = user.asPrismObject().findItem(itemPath.getItemPath());
var value = item != null ? item.getRealValue() : null;
return value == null ? "" : value.toString();
};
}
Expand Down
10 changes: 4 additions & 6 deletions ...src/main/java/com/evolveum/midpoint/authentication/impl/provider/CorrelationProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,11 @@ public Authentication doAuthenticate(
if (owner != null) {
correlationModuleAuthentication.addOwner(owner);
return createAuthenticationToken(owner, focusType);
} else if (correlationModuleAuthentication.isLastCorrelator()) {
correlationResult.getCandidateOwnersMap().values()
.forEach(c -> correlationModuleAuthentication.addOwner(c.getObject()));
return createAuthenticationToken(correlationModuleAuthentication.getOwners().get(0), focusType);
}
// TODO wrong-wrong just to test multi-users finish screen
// else if (correlationModuleAuthentication.isLastCorrelator()) {
// correlationResult.getCandidateOwnersMap().values()
// .forEach(c -> correlationModuleAuthentication.addOwner(c.getObject()));
// return createAuthenticationToken(correlationModuleAuthentication.getOwners().get(0), focusType);
// }

CandidateOwnersMap ownersMap = correlationResult.getCandidateOwnersMap();
correlationModuleAuthentication.addCandidateOwners(ownersMap);
Expand Down
1 change: 1 addition & 0 deletions model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ <F extends FocusType> NonceCredentialsPolicyType determineNonceCredentialsPolicy
OperationResult result)
throws SchemaException, ExpressionEvaluationException, CommunicationException, SecurityViolationException, ConfigurationException;

//TODO needs Class<F> type parameter
<F extends FocusType> SecurityPolicyType getSecurityPolicy(
PrismObject<F> focus, String archetypeOid, Task task, OperationResult parentResult)
throws ObjectNotFoundException, SchemaException, CommunicationException,
Expand Down

0 comments on commit 5c204a3

Please sign in to comment.