Merge remote-tracking branch 'origin/master' into feature/shadow-meta…

…data
Evolveum · May 18, 2023 · 340eacd · 340eacd
2 parents 8750d16 + 526e7c3
commit 340eacd
Show file tree

Hide file tree

Showing 106 changed files with 69 additions and 14,605 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -76,7 +76,6 @@
 import com.evolveum.midpoint.web.page.admin.reports.PageCreatedReports;
 import com.evolveum.midpoint.web.page.admin.resources.PageConnectorHosts;
 import com.evolveum.midpoint.web.page.admin.resources.PageImportResource;
-import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
 import com.evolveum.midpoint.web.page.admin.server.PageNodes;
 import com.evolveum.midpoint.web.page.admin.server.PageTasksCertScheduling;
 import com.evolveum.midpoint.web.page.admin.workflow.PageAttorneySelection;
@@ -632,16 +631,6 @@ private boolean isEditForAdminObjectDetails() {
         return false;
     }
 
-    private boolean isEditForResourceWizzard() {
-        PageBase pageBase = getPageBase();
-
-        if (pageBase instanceof PageResourceWizard) {
-            return !((PageResourceWizard) pageBase).isNewResource();
-        }
-
-        return false;
-    }
-
     private void createFocusPageNewEditMenu(MainMenuItem mainMenuItem, String newKey, String editKey,
             final Class<? extends PageBase> newPageClass) {
 

diff --git a/...ava/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceSchemaPanel.java b/...ava/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceSchemaPanel.java
@@ -8,46 +8,15 @@
 package com.evolveum.midpoint.gui.impl.page.admin.resource.component;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.model.NonEmptyLoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.ResourceDetailsModel;
-import com.evolveum.midpoint.model.api.util.ResourceUtils;
-import com.evolveum.midpoint.prism.PrismContainer;
-import com.evolveum.midpoint.prism.PrismContext;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.exception.CommonException;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
-import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.TabbedPanel;
-import com.evolveum.midpoint.web.component.wizard.WizardStep;
-import com.evolveum.midpoint.web.component.wizard.resource.component.SchemaListPanel;
-import com.evolveum.midpoint.web.component.wizard.resource.component.XmlEditorPanel;
-import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
+import com.evolveum.midpoint.web.page.admin.resources.component.SchemaListPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
-import org.apache.wicket.extensions.markup.html.tabs.ITab;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
 @PanelType(name = "resourceSchema")
 @PanelInstance(identifier = "resourceSchema", applicableForType = ResourceType.class,
         display = @PanelDisplay(label = "PageResource.tab.resourceSchema", icon = GuiStyleConstants.CLASS_ICON_RESOURCE_SCHEMA, order = 110))

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageAttributeVerification.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageAttributeVerification.java
@@ -123,18 +123,13 @@ private AttributeVerificationAuthenticationModuleType getModuleByIdentifier(Stri
             return null;
         }
         UserType user = userModel.getObject();
-        if (user == null) {
-            getSession().error(getString("User not found"));
-            throw new RestartResponseException(PageError.class);
-        }
-        SecurityPolicyType securityPolicy = resolveSecurityPolicy(user.asPrismObject());
-        if (securityPolicy == null || securityPolicy.getAuthentication() == null) {
-            getSession().error(getString("Security policy not found"));
-            throw new RestartResponseException(PageError.class);
+        SecurityPolicyType securityPolicy = resolveUserSecurityPolicy(user);
+        if (securityPolicy.getAuthentication() == null || securityPolicy.getAuthentication().getModules() == null) {
+            return null;
         }
         return securityPolicy.getAuthentication().getModules().getAttributeVerification()
                 .stream()
-                .filter(m -> moduleIdentifier.equals(m.getIdentifier()) || moduleIdentifier.equals(m.getName()))
+                .filter(m -> moduleIdentifier.equals(m.getIdentifier()))
                 .findFirst()
                 .orElse(null);
     }

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageAuthenticationBase.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageAuthenticationBase.java
@@ -14,6 +14,8 @@
 import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
+import com.evolveum.midpoint.web.page.error.PageError;
+
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -236,4 +238,17 @@ protected ObjectQuery createDynamicFormQuery() {
     }
 
     protected abstract DynamicFormPanel<UserType> getDynamicForm();
+
+    protected SecurityPolicyType resolveUserSecurityPolicy(UserType user) {
+        if (user == null) {
+            getSession().error(getString("User not found"));
+            throw new RestartResponseException(PageError.class);
+        }
+        SecurityPolicyType securityPolicy = resolveSecurityPolicy(user.asPrismObject());
+        if (securityPolicy == null) {
+            getSession().error(getString("Security policy not found"));
+            throw new RestartResponseException(PageError.class);
+        }
+        return securityPolicy;
+    }
 }
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageFocusIdentification.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageFocusIdentification.java
@@ -17,6 +17,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
+import com.evolveum.midpoint.schema.util.SecurityPolicyUtil;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.prism.DynamicFormPanel;
 import com.evolveum.midpoint.web.page.error.PageError;
@@ -117,18 +118,13 @@ private FocusIdentificationAuthenticationModuleType getModuleByIdentifier(String
             return null;
         }
         UserType user = userModel.getObject();
-        if (user == null) {
-            getSession().error(getString("User not found"));
-            throw new RestartResponseException(PageError.class);
-        }
-        SecurityPolicyType securityPolicy = resolveSecurityPolicy(user.asPrismObject());
-        if (securityPolicy == null || securityPolicy.getAuthentication() == null) {
-            getSession().error(getString("Security policy not found"));
-            throw new RestartResponseException(PageError.class);
+        SecurityPolicyType securityPolicy = resolveUserSecurityPolicy(user);
+        if (securityPolicy.getAuthentication() == null || securityPolicy.getAuthentication().getModules() == null) {
+            return null;
         }
         return securityPolicy.getAuthentication().getModules().getFocusIdentification()
                 .stream()
-                .filter(m -> moduleIdentifier.equals(m.getIdentifier()) || moduleIdentifier.equals(m.getName()))
+                .filter(m -> moduleIdentifier.equals(m.getIdentifier()))
                 .findFirst()
                 .orElse(null);
     }

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
@@ -32,7 +32,6 @@
 import com.evolveum.midpoint.web.component.AceEditor;
 import com.evolveum.midpoint.web.component.input.dto.ExpressionTypeDto;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
 import com.evolveum.midpoint.web.util.ExpressionUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
@@ -195,10 +194,6 @@ protected void onSubmit(AjaxRequestTarget target) {
         Label updateLabel = new Label(ID_LABEL_UPDATE, createStringResource(getUpdateLabelKey()));
         updateLabel.setRenderBodyOnly(true);
         update.add(updateLabel);
-        if (parentPage instanceof PageResourceWizard) {
-            ((PageResourceWizard) parentPage).addEditingEnabledBehavior(this);
-            ((PageResourceWizard) parentPage).addEditingVisibleBehavior(update);
-        }
         add(update);
 
         add(WebComponentUtil.createHelp(ID_T_TYPE));

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/wizard/ResourceWizardPreviousButton.java b/...rc/main/java/com/evolveum/midpoint/web/component/wizard/ResourceWizardPreviousButton.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.html