You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/03/27 07:19:29 UTC

[syncope] branch master updated: [SYNCOPE-1545] Adding WA > Client Applications (#252)

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 453ff25  [SYNCOPE-1545]  Adding WA > Client Applications (#252)
453ff25 is described below

commit 453ff25efdd23ec8335c60f4d8d39ea16587f7aa
Author: Francesco Chicchiriccò <il...@users.noreply.github.com>
AuthorDate: Sat Mar 27 08:19:19 2021 +0100

    [SYNCOPE-1545]  Adding WA > Client Applications (#252)
---
 .../console/clientapps/CASSPDirectoryPanel.java    |  51 +++
 .../clientapps/ClientAppDirectoryPanel.java}       | 131 +++-----
 .../clientapps/ClientAppModalPanelBuilder.java     | 366 +++++++++++++++++++++
 .../client/console/clientapps/ClientApps.java      |  76 +++++
 .../console/clientapps/OIDCRPDirectoryPanel.java   |  75 +++++
 .../console/clientapps/SAML2SPDirectoryPanel.java  |  62 ++++
 .../client/console/commons/AMConstants.java        |   2 +
 .../console/commons/AMRealmPolicyProvider.java     |  14 +-
 .../apache/syncope/client/console/pages/WA.java    |   3 +-
 .../console/panels/SRARouteWizardBuilder.java      |  16 +-
 .../client/console/rest/ClientAppRestClient.java   |  67 ++++
 .../clientapps/ClientAppDirectoryPanel.properties  |  56 ++++
 .../ClientAppDirectoryPanel_fr_CA.properties       |  56 ++++
 .../ClientAppDirectoryPanel_it.properties          |  56 ++++
 .../ClientAppDirectoryPanel_ja.properties          |  56 ++++
 .../ClientAppDirectoryPanel_pt_BR.properties       |  56 ++++
 .../ClientAppDirectoryPanel_ru.properties          |  57 ++++
 .../ClientAppModalPanelBuilder$Profile.html        |  27 ++
 .../client/console/clientapps/ClientApps.html      |  23 ++
 .../policies/ProvisioningPolicyModalPanel.java     |   2 +-
 .../wizards/any/LinkedAccountPlainAttrsPanel.java  |   5 +-
 .../wizards/resources/ProvisionWizardBuilder.java  |   4 +-
 .../wizards/resources/ResourceSecurityPanel.java   |   8 +-
 .../client/console/SyncopeWebApplication.java      |  13 +-
 .../console/commons/IdRepoRealmPolicyProvider.java |  10 +-
 .../syncope/client/console/panels/BeanPanel.java   |   4 +-
 .../client/console/panels/PlainSchemaDetails.java  |   7 +-
 .../console/policies/PolicyDirectoryPanel.java     |  13 +-
 .../console/policies/PolicyModalPanelBuilder.java  | 117 ++++---
 .../console/policies/PolicyRuleDirectoryPanel.java |   8 +-
 .../console/policies/PolicyRuleWizardBuilder.java  |   4 +-
 .../console/reports/ReportDirectoryPanel.java      |   2 +-
 .../client/console/rest/PolicyRestClient.java      |  26 +-
 .../tasks/ProvisioningTaskDirectoryPanel.java      |   2 +-
 .../console/tasks/SchedTaskDirectoryPanel.java     |   2 +-
 .../client/console/widgets/AlertWidget.java        |  10 +-
 .../client/console/widgets/JobActionPanel.java     |   4 +-
 .../syncope/client/console/widgets/JobWidget.java  |   2 +-
 .../client/console/wizards/any/AbstractAttrs.java  |   5 +-
 .../wizards/any/AbstractAttrsWizardStep.java       |  12 +-
 .../client/console/wizards/any/PlainAttrs.java     |   4 +-
 .../client/enduser/layout/AnyLayoutUtils.java      |   2 +-
 .../enduser/wizards/any/AnyWizardBuilder.java      |   3 +-
 .../client/enduser/wizards/any/UserDetails.java    |   5 +-
 .../apache/syncope/common/lib/to/ClientAppTO.java  |   6 +-
 .../org/apache/syncope/common/lib/to/OIDCRPTO.java |  19 +-
 .../apache/syncope/common/lib/to/SAML2SPTO.java    |  75 ++---
 .../syncope/common/lib/types/OIDCGrantType.java    |  24 ++
 .../syncope/common/lib/types/OIDCResponseType.java |  32 ++
 ...{XmlSecAlgorithms.java => XmlSecAlgorithm.java} |   4 +-
 .../core/rest/cxf/batch/BatchItemRequest.java      |  14 +-
 .../core/persistence/api/entity/auth/OIDCRP.java   |   9 +-
 .../core/persistence/api/entity/auth/SAML2SP.java  |  34 +-
 .../persistence/jpa/entity/auth/JPAOIDCRP.java     |  22 +-
 .../persistence/jpa/entity/auth/JPASAML2SP.java    | 113 +++----
 .../core/persistence/jpa/inner/OIDCRPTest.java     |   8 +-
 .../core/persistence/jpa/inner/SAML2SPTest.java    |  25 +-
 .../java/data/ClientAppDataBinderImpl.java         |  68 ++--
 .../common/ui/panels/UserRequestFormPanel.java     |   8 +-
 .../console/panels/UserRequestFormModal.java       |   6 +-
 .../syncope/client/enduser/pages/Flowable.java     |  68 ++--
 .../saml2sp4ui/AbstractSAML2SP4UIResource.java     |   2 +-
 .../resources/saml2sp4ui/LoginResource.java        |   5 +-
 .../resources/saml2sp4ui/LogoutResource.java       |   2 +-
 .../syncope/core/logic/init/SAML2SP4UILoader.java  |  10 +-
 .../console/panels/SCIMConfGeneralPanel.java       |  43 +--
 .../org/apache/syncope/fit/AbstractITCase.java     |  10 +-
 .../service/ReportTemplateManagerService.java      |   5 +-
 .../view/ResourceExplorerTopComponent.java         |   2 +-
 .../sra/security/saml2/SAML2MetadataEndpoint.java  |   3 +-
 .../syncope/wa/starter/mapping/OIDCRPTOMapper.java |   8 +-
 .../wa/starter/mapping/SAML2SPTOMapper.java        |   5 +-
 .../wa/starter/SyncopeWAServiceRegistryTest.java   |   6 +-
 73 files changed, 1629 insertions(+), 531 deletions(-)

diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java
new file mode 100644
index 0000000..bae8353
--- /dev/null
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.clientapps;
+
+import java.util.List;
+import org.apache.syncope.common.lib.to.CASSPTO;
+import org.apache.syncope.common.lib.types.AMEntitlement;
+import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.StringResourceModel;
+
+public class CASSPDirectoryPanel extends ClientAppDirectoryPanel<CASSPTO> {
+
+    private static final long serialVersionUID = 1L;
+
+    public CASSPDirectoryPanel(final String id, final PageReference pageRef) {
+        super(id, ClientAppType.CASSP, pageRef);
+
+        CASSPTO defaultItem = new CASSPTO();
+
+        this.addNewItemPanelBuilder(
+                new ClientAppModalPanelBuilder<>(ClientAppType.CASSP, defaultItem, modal, pageRef), true);
+        MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER, AMEntitlement.CLIENTAPP_CREATE);
+
+        initResultTable();
+    }
+
+    @Override
+    protected void addCustomColumnFields(final List<IColumn<CASSPTO, String>> columns) {
+        columns.add(new PropertyColumn<>(new StringResourceModel("serviceId", this), "serviceId", "serviceId"));
+    }
+}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
similarity index 56%
copy from client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
copy to client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
index 67b3056..84d37e7 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.client.console.policies;
+package org.apache.syncope.client.console.clientapps;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 import java.util.ArrayList;
@@ -25,24 +25,22 @@ import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.ui.commons.Constants;
-import org.apache.syncope.client.ui.commons.DirectoryDataProvider;
-import org.apache.syncope.client.console.commons.IdRepoConstants;
+import org.apache.syncope.client.console.commons.AMConstants;
 import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
-import org.apache.syncope.client.console.pages.BasePage;
 import org.apache.syncope.client.console.panels.DirectoryPanel;
-import org.apache.syncope.client.console.rest.PolicyRestClient;
-import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.CollectionPropertyColumn;
+import org.apache.syncope.client.console.rest.ClientAppRestClient;
 import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.KeyPropertyColumn;
-import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink.ActionType;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel;
+import org.apache.syncope.client.ui.commons.Constants;
+import org.apache.syncope.client.ui.commons.DirectoryDataProvider;
+import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
 import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
-import org.apache.syncope.common.lib.types.IdRepoEntitlement;
 import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.policy.PolicyTO;
-import org.apache.syncope.common.lib.types.PolicyType;
+import org.apache.syncope.common.lib.to.ClientAppTO;
+import org.apache.syncope.common.lib.types.AMEntitlement;
+import org.apache.syncope.common.lib.types.ClientAppType;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.event.Broadcast;
@@ -53,45 +51,16 @@ import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.StringResourceModel;
 
-/**
- * Policies page.
- *
- * @param <T> policy type.
- */
-public abstract class PolicyDirectoryPanel<T extends PolicyTO>
-        extends DirectoryPanel<T, T, DirectoryDataProvider<T>, PolicyRestClient> {
-
-    private static final long serialVersionUID = 4984337552918213290L;
+public abstract class ClientAppDirectoryPanel<T extends ClientAppTO>
+        extends DirectoryPanel<T, T, DirectoryDataProvider<T>, ClientAppRestClient> {
 
-    protected final BaseModal<T> ruleCompositionModal = new BaseModal<T>(Constants.OUTER) {
+    private static final long serialVersionUID = 1L;
 
-        private static final long serialVersionUID = 389935548143327858L;
+    private final ClientAppType type;
 
-        @Override
-        protected void onConfigure() {
-            super.onConfigure();
-            setFooterVisible(false);
-        }
-
-    };
-
-    protected final BaseModal<T> policySpecModal = new BaseModal<>(Constants.OUTER);
-
-    private final PolicyType type;
-
-    public PolicyDirectoryPanel(final String id, final PolicyType policyType, final PageReference pageRef) {
+    public ClientAppDirectoryPanel(final String id, final ClientAppType type, final PageReference pageRef) {
         super(id, pageRef, true);
-        this.type = policyType;
-        this.restClient = new PolicyRestClient();
-
-        ruleCompositionModal.size(Modal.Size.Large);
-        setWindowClosedReloadCallback(ruleCompositionModal);
-        addOuterObject(ruleCompositionModal);
-
-        policySpecModal.size(Modal.Size.Large);
-        policySpecModal.addSubmitButton();
-        setWindowClosedReloadCallback(policySpecModal);
-        addOuterObject(policySpecModal);
+        this.type = type;
 
         modal.addSubmitButton();
         modal.size(Modal.Size.Large);
@@ -106,26 +75,23 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
 
     @Override
     protected List<IColumn<T, String>> getColumns() {
-        final List<IColumn<T, String>> columns = new ArrayList<>();
+        List<IColumn<T, String>> columns = new ArrayList<>();
 
         columns.add(new KeyPropertyColumn<>(
                 new StringResourceModel(Constants.KEY_FIELD_NAME, this), Constants.KEY_FIELD_NAME));
         columns.add(new PropertyColumn<>(
-                new StringResourceModel("description", this), "description", "description"));
-        if (type != PolicyType.ACCESS && type != PolicyType.ATTR_RELEASE && type != PolicyType.AUTH) {
-            columns.add(new CollectionPropertyColumn<>(
-                    new StringResourceModel("usedByResources", this), "usedByResources"));
-        }
-        if (type != PolicyType.PULL && type != PolicyType.PUSH) {
-            columns.add(new CollectionPropertyColumn<>(
-                    new StringResourceModel("usedByRealms", this), "usedByRealms"));
-        }
+                new StringResourceModel("name", this), "name", "name"));
+        columns.add(new PropertyColumn<>(
+                new StringResourceModel("clientAppId", this), "clientAppId", "clientAppId"));
 
         addCustomColumnFields(columns);
 
         return columns;
     }
 
+    protected void addCustomColumnFields(final List<IColumn<T, String>> columns) {
+    }
+
     @Override
     public ActionsPanel<T> getActions(final IModel<T> model) {
         final ActionsPanel<T> panel = super.getActions(model);
@@ -135,94 +101,87 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
             private static final long serialVersionUID = -3722207913631435501L;
 
             @Override
-            public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) {
-                send(PolicyDirectoryPanel.this, Broadcast.EXACT,
+            public void onClick(final AjaxRequestTarget target, final ClientAppTO ignore) {
+                send(ClientAppDirectoryPanel.this, Broadcast.EXACT,
                         new AjaxWizard.EditItemActionEvent<>(
-                                PolicyRestClient.getPolicy(type, model.getObject().getKey()), target));
+                                ClientAppRestClient.read(type, model.getObject().getKey()), target));
             }
-        }, ActionLink.ActionType.EDIT, IdRepoEntitlement.POLICY_UPDATE);
+        }, ActionLink.ActionType.EDIT, AMEntitlement.CLIENTAPP_UPDATE);
 
         panel.add(new ActionLink<T>() {
 
             private static final long serialVersionUID = -3722207913631435501L;
 
             @Override
-            public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) {
-                final PolicyTO clone = SerializationUtils.clone(model.getObject());
+            public void onClick(final AjaxRequestTarget target, final ClientAppTO ignore) {
+                ClientAppTO clone = SerializationUtils.clone(model.getObject());
                 clone.setKey(null);
-                send(PolicyDirectoryPanel.this, Broadcast.EXACT,
+                clone.setClientAppId(null);
+                send(ClientAppDirectoryPanel.this, Broadcast.EXACT,
                         new AjaxWizard.EditItemActionEvent<>(clone, target));
             }
-        }, ActionLink.ActionType.CLONE, IdRepoEntitlement.POLICY_CREATE);
-
-        addCustomActions(panel, model);
+        }, ActionLink.ActionType.CLONE, AMEntitlement.CLIENTAPP_CREATE);
 
         panel.add(new ActionLink<T>() {
 
             private static final long serialVersionUID = -3722207913631435501L;
 
             @Override
-            public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) {
-                final T policyTO = model.getObject();
+            public void onClick(final AjaxRequestTarget target, final ClientAppTO ignore) {
+                T clientAppTO = model.getObject();
                 try {
-                    PolicyRestClient.delete(type, policyTO.getKey());
+                    ClientAppRestClient.delete(type, clientAppTO.getKey());
                     SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
                     target.add(container);
                 } catch (SyncopeClientException e) {
-                    LOG.error("While deleting {}", policyTO.getKey(), e);
+                    LOG.error("While deleting {}", clientAppTO.getKey(), e);
                     SyncopeConsoleSession.get().onException(e);
                 }
-                ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
+                ((BaseWebPage) pageRef.getPage()).getNotificationPanel().refresh(target);
             }
-        }, ActionLink.ActionType.DELETE, IdRepoEntitlement.POLICY_DELETE, true);
+        }, ActionLink.ActionType.DELETE, AMEntitlement.CLIENTAPP_DELETE, true);
 
         return panel;
     }
 
-    protected void addCustomColumnFields(final List<IColumn<T, String>> columns) {
-    }
-
-    protected void addCustomActions(final ActionsPanel<T> panel, final IModel<T> model) {
-    }
-
     @Override
     protected Collection<ActionType> getBatches() {
         return List.of();
     }
 
     @Override
-    protected PolicyDataProvider dataProvider() {
-        return new PolicyDataProvider(rows);
+    protected ClientAppDataProvider dataProvider() {
+        return new ClientAppDataProvider(rows);
     }
 
     @Override
     protected String paginatorRowsKey() {
-        return IdRepoConstants.PREF_POLICY_PAGINATOR_ROWS;
+        return AMConstants.PREF_CLIENTAPP_PAGINATOR_ROWS;
     }
 
-    protected class PolicyDataProvider extends DirectoryDataProvider<T> {
+    private class ClientAppDataProvider extends DirectoryDataProvider<T> {
 
         private static final long serialVersionUID = 4725679400450513556L;
 
         private final SortableDataProviderComparator<T> comparator;
 
-        public PolicyDataProvider(final int paginatorRows) {
+        ClientAppDataProvider(final int paginatorRows) {
             super(paginatorRows);
 
-            setSort("description", SortOrder.ASCENDING);
+            setSort("name", SortOrder.ASCENDING);
             comparator = new SortableDataProviderComparator<>(this);
         }
 
         @Override
         public Iterator<T> iterator(final long first, final long count) {
-            List<T> list = PolicyRestClient.getPolicies(type);
+            List<T> list = ClientAppRestClient.list(type);
             list.sort(comparator);
             return list.subList((int) first, (int) first + (int) count).iterator();
         }
 
         @Override
         public long size() {
-            return PolicyRestClient.getPolicies(type).size();
+            return ClientAppRestClient.list(type).size();
         }
 
         @Override
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
new file mode 100644
index 0000000..2b16c3b
--- /dev/null
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
@@ -0,0 +1,366 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.clientapps;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.panels.AbstractModalPanel;
+import org.apache.syncope.client.console.rest.ClientAppRestClient;
+import org.apache.syncope.client.console.rest.PolicyRestClient;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.syncope.client.console.wicket.markup.html.form.MultiFieldPanel;
+import org.apache.syncope.client.console.wicket.markup.html.form.PolicyRenderer;
+import org.apache.syncope.client.ui.commons.Constants;
+import org.apache.syncope.client.ui.commons.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
+import org.apache.syncope.client.ui.commons.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.client.ui.commons.markup.html.form.AjaxPalettePanel;
+import org.apache.syncope.client.ui.commons.markup.html.form.AjaxSpinnerFieldPanel;
+import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
+import org.apache.syncope.client.ui.commons.panels.WizardModalPanel;
+import org.apache.syncope.client.ui.commons.wizards.AbstractModalPanelBuilder;
+import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
+import org.apache.syncope.common.lib.policy.PolicyTO;
+import org.apache.syncope.common.lib.to.ClientAppTO;
+import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
+import org.apache.syncope.common.lib.types.OIDCSubjectType;
+import org.apache.syncope.common.lib.types.PolicyType;
+import org.apache.syncope.common.lib.types.SAML2SPNameId;
+import org.apache.syncope.common.lib.types.XmlSecAlgorithm;
+import org.apache.wicket.Component;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.AbstractSingleSelectChoice;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.validation.validator.UrlValidator;
+
+public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractModalPanelBuilder<T> {
+
+    private static final long serialVersionUID = 5945391813567245081L;
+
+    private final IModel<Map<String, String>> accessPolicies = new LoadableDetachableModel<Map<String, String>>() {
+
+        private static final long serialVersionUID = -2012833443695917883L;
+
+        @Override
+        protected Map<String, String> load() {
+            return PolicyRestClient.list(PolicyType.ACCESS).stream().
+                    collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
+        }
+    };
+
+    private final IModel<Map<String, String>> attrReleasePolicies = new LoadableDetachableModel<Map<String, String>>() {
+
+        private static final long serialVersionUID = -2012833443695917883L;
+
+        @Override
+        protected Map<String, String> load() {
+            return PolicyRestClient.list(PolicyType.ATTR_RELEASE).stream().
+                    collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
+        }
+    };
+
+    private final IModel<Map<String, String>> authPolicies = new LoadableDetachableModel<Map<String, String>>() {
+
+        private static final long serialVersionUID = -2012833443695917883L;
+
+        @Override
+        protected Map<String, String> load() {
+            return PolicyRestClient.list(PolicyType.AUTH).stream().
+                    collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
+        }
+    };
+
+    private final BaseModal<T> modal;
+
+    private final ClientAppType type;
+
+    public ClientAppModalPanelBuilder(
+            final ClientAppType type, final T defaultItem, final BaseModal<T> modal, final PageReference pageRef) {
+
+        super(defaultItem, pageRef);
+        this.type = type;
+        this.modal = modal;
+    }
+
+    @Override
+    public WizardModalPanel<T> build(final String id, final int index, final AjaxWizard.Mode mode) {
+        return new Profile(newModelObject(), modal, pageRef);
+    }
+
+    private class Profile extends AbstractModalPanel<T> {
+
+        private static final long serialVersionUID = 1L;
+
+        private final T clientAppTO;
+
+        Profile(final T clientAppTO, final BaseModal<T> modal, final PageReference pageRef) {
+            super(modal, pageRef);
+            modal.setFormModel(clientAppTO);
+
+            this.clientAppTO = clientAppTO;
+
+            List<Component> fields = new ArrayList<>();
+
+            AjaxTextFieldPanel name = new AjaxTextFieldPanel(
+                    "field", "name", new PropertyModel<>(clientAppTO, "name"), false);
+            fields.add(name.setRequired(true));
+
+            if (clientAppTO.getClientAppId() == null) {
+                Stream.of(ClientAppType.values()).map(ClientAppRestClient::list).flatMap(List::stream).
+                        max(Comparator.comparing(ClientAppTO::getClientAppId)).
+                        ifPresent(app -> clientAppTO.setClientAppId(app.getClientAppId() + 1));
+            }
+            fields.add(new AjaxSpinnerFieldPanel.Builder<Long>().build(
+                    "field", "clientAppId", Long.class,
+                    new PropertyModel<>(clientAppTO, "clientAppId")).setRequired(true));
+
+            fields.add(new AjaxTextFieldPanel(
+                    "field", "description", new PropertyModel<>(clientAppTO, "description"), false).setRequired(true));
+
+            AjaxDropDownChoicePanel<String> accessPolicy = new AjaxDropDownChoicePanel<>(
+                    "field", "accessPolicy", new PropertyModel<>(clientAppTO, "accessPolicy"), false);
+            accessPolicy.setChoiceRenderer(new PolicyRenderer(accessPolicies));
+            accessPolicy.setChoices(new ArrayList<>(accessPolicies.getObject().keySet()));
+            ((AbstractSingleSelectChoice<?>) accessPolicy.getField()).setNullValid(true);
+            fields.add(accessPolicy);
+
+            AjaxDropDownChoicePanel<String> attrReleasePolicy = new AjaxDropDownChoicePanel<>(
+                    "field", "attrReleasePolicy", new PropertyModel<>(clientAppTO, "attrReleasePolicy"), false);
+            attrReleasePolicy.setChoiceRenderer(new PolicyRenderer(attrReleasePolicies));
+            attrReleasePolicy.setChoices(new ArrayList<>(attrReleasePolicies.getObject().keySet()));
+            ((AbstractSingleSelectChoice<?>) attrReleasePolicy.getField()).setNullValid(true);
+            fields.add(attrReleasePolicy);
+
+            AjaxDropDownChoicePanel<String> authPolicy = new AjaxDropDownChoicePanel<>(
+                    "field", "authPolicy", new PropertyModel<>(clientAppTO, "authPolicy"), false);
+            authPolicy.setChoiceRenderer(new PolicyRenderer(authPolicies));
+            authPolicy.setChoices(new ArrayList<>(authPolicies.getObject().keySet()));
+            ((AbstractSingleSelectChoice<?>) authPolicy.getField()).setNullValid(true);
+            fields.add(authPolicy);
+
+            fields.add(new AjaxTextFieldPanel(
+                    "field", "theme", new PropertyModel<>(clientAppTO, "theme"), false).setRequired(true));
+
+            switch (type) {
+                case CASSP:
+                    fields.add(new AjaxTextFieldPanel(
+                            "field", "serviceId", new PropertyModel<>(clientAppTO, "serviceId"), false).
+                            setRequired(true));
+                    break;
+
+                case OIDCRP:
+                    AjaxTextFieldPanel clientId = new AjaxTextFieldPanel(
+                            "field", "clientId", new PropertyModel<>(clientAppTO, "clientId"), false);
+                    fields.add(clientId.setRequired(true));
+                    name.getField().add(new IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+
+                        @Override
+                        protected void onUpdate(final AjaxRequestTarget target) {
+                            if (StringUtils.isBlank(clientId.getModelObject())) {
+                                clientId.setModelObject(name.getModelObject());
+                                target.add(clientId);
+                            }
+                        }
+                    });
+
+                    AjaxTextFieldPanel clientSecret = new AjaxTextFieldPanel(
+                            "field", "clientSecret", new PropertyModel<>(clientAppTO, "clientSecret"), false);
+                    clientSecret.setChoices(List.of(RandomStringUtils.randomAlphanumeric(15)));
+                    fields.add(clientSecret.setRequired(true));
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field", "signIdToken", new PropertyModel<>(clientAppTO, "signIdToken")));
+
+                    AjaxDropDownChoicePanel<OIDCSubjectType> subjectType = new AjaxDropDownChoicePanel<>(
+                            "field", "subjectType", new PropertyModel<>(clientAppTO, "subjectType"), false);
+                    subjectType.setChoices(List.of(OIDCSubjectType.values()));
+                    subjectType.addRequiredLabel().setEnabled(true);
+                    fields.add(subjectType);
+
+                    AjaxTextFieldPanel redirectUri = new AjaxTextFieldPanel("panel", "redirectUris", new Model<>());
+                    redirectUri.addValidator(new UrlValidator());
+                    fields.add(new MultiFieldPanel.Builder<String>(
+                            new PropertyModel<>(clientAppTO, "redirectUris")).build(
+                            "field",
+                            "redirectUris",
+                            redirectUri));
+
+                    fields.add(new AjaxPalettePanel.Builder<OIDCGrantType>().setName("supportedGrantTypes").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "supportedGrantTypes"),
+                            new ListModel<>(List.of(OIDCGrantType.values()))));
+
+                    fields.add(new AjaxPalettePanel.Builder<OIDCResponseType>().setName("supportedResponseTypes").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "supportedResponseTypes"),
+                            new ListModel<>(List.of(OIDCResponseType.values()))));
+
+                    AjaxTextFieldPanel logoutUri = new AjaxTextFieldPanel(
+                            "field", "logoutUri", new PropertyModel<>(clientAppTO, "logoutUri"), false);
+                    logoutUri.addValidator(new UrlValidator());
+                    fields.add(logoutUri);
+                    break;
+
+                case SAML2SP:
+                    AjaxTextFieldPanel entityId = new AjaxTextFieldPanel(
+                            "field", "entityId", new PropertyModel<>(clientAppTO, "entityId"), false);
+                    entityId.addValidator(new UrlValidator());
+                    fields.add(entityId.setRequired(true));
+
+                    AjaxTextFieldPanel metadataLocation = new AjaxTextFieldPanel(
+                            "field", "metadataLocation",
+                            new PropertyModel<>(clientAppTO, "metadataLocation"), false);
+                    metadataLocation.addValidator(new UrlValidator());
+                    fields.add(metadataLocation.setRequired(true));
+
+                    AjaxTextFieldPanel metadataSignatureLocation = new AjaxTextFieldPanel(
+                            "field", "metadataSignatureLocation",
+                            new PropertyModel<>(clientAppTO, "metadataSignatureLocation"), false);
+                    metadataSignatureLocation.addValidator(new UrlValidator());
+                    fields.add(metadataSignatureLocation);
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field", "signAssertions", new PropertyModel<>(clientAppTO, "signAssertions")));
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field", "signResponses", new PropertyModel<>(clientAppTO, "signResponses")));
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field", "encryptionOptional", new PropertyModel<>(clientAppTO, "encryptionOptional")));
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field", "encryptAssertions", new PropertyModel<>(clientAppTO, "encryptAssertions")));
+
+                    fields.add(new AjaxTextFieldPanel(
+                            "field", "requiredAuthenticationContextClass",
+                            new PropertyModel<>(clientAppTO, "requiredAuthenticationContextClass"), false));
+
+                    AjaxDropDownChoicePanel<SAML2SPNameId> requiredNameIdFormat = new AjaxDropDownChoicePanel<>(
+                            "field", "requiredNameIdFormat", new PropertyModel<>(clientAppTO, "requiredNameIdFormat"),
+                            false);
+                    requiredNameIdFormat.setChoices(List.of(SAML2SPNameId.values()));
+                    requiredNameIdFormat.addRequiredLabel().setEnabled(true);
+                    fields.add(requiredNameIdFormat);
+
+                    fields.add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).build(
+                            "field", "skewAllowance", Integer.class,
+                            new PropertyModel<>(clientAppTO, "skewAllowance")));
+
+                    fields.add(new AjaxTextFieldPanel(
+                            "field", "nameIdQualifier", new PropertyModel<>(clientAppTO, "nameIdQualifier"), false));
+
+                    AjaxTextFieldPanel assertionAudience = new AjaxTextFieldPanel(
+                            "panel", "assertionAudience", new Model<>());
+                    assertionAudience.addValidator(new UrlValidator());
+                    fields.add(new MultiFieldPanel.Builder<String>(
+                            new PropertyModel<>(clientAppTO, "assertionAudiences")).build(
+                            "field",
+                            "assertionAudiences",
+                            assertionAudience));
+
+                    fields.add(new AjaxTextFieldPanel(
+                            "field", "serviceProviderNameIdQualifier",
+                            new PropertyModel<>(clientAppTO, "serviceProviderNameIdQualifier"), false));
+
+                    fields.add(new AjaxPalettePanel.Builder<XmlSecAlgorithm>().
+                            setName("signingSignatureAlgorithms").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "signingSignatureAlgorithms"),
+                            new ListModel<>(List.of(XmlSecAlgorithm.values()))));
+
+                    fields.add(new AjaxPalettePanel.Builder<XmlSecAlgorithm>().
+                            setName("signingSignatureReferenceDigestMethods").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "signingSignatureReferenceDigestMethods"),
+                            new ListModel<>(List.of(XmlSecAlgorithm.values()))));
+
+                    fields.add(new AjaxPalettePanel.Builder<XmlSecAlgorithm>().
+                            setName("encryptionDataAlgorithms").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "encryptionDataAlgorithms"),
+                            new ListModel<>(List.of(XmlSecAlgorithm.values()))));
+
+                    fields.add(new AjaxPalettePanel.Builder<XmlSecAlgorithm>().
+                            setName("encryptionKeyAlgorithms").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "encryptionKeyAlgorithms"),
+                            new ListModel<>(List.of(XmlSecAlgorithm.values()))));
+
+                    fields.add(new AjaxPalettePanel.Builder<XmlSecAlgorithm>().
+                            setName("signingSignatureBlackListedAlgorithms").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "signingSignatureBlackListedAlgorithms"),
+                            new ListModel<>(List.of(XmlSecAlgorithm.values()))));
+
+                    fields.add(new AjaxPalettePanel.Builder<XmlSecAlgorithm>().
+                            setName("encryptionBlackListedAlgorithms").build(
+                            "field",
+                            new PropertyModel<>(clientAppTO, "encryptionBlackListedAlgorithms"),
+                            new ListModel<>(List.of(XmlSecAlgorithm.values()))));
+                    break;
+
+                default:
+            }
+
+            add(new ListView<Component>("fields", fields) {
+
+                private static final long serialVersionUID = -9180479401817023838L;
+
+                @Override
+                protected void populateItem(final ListItem<Component> item) {
+                    item.add(item.getModelObject());
+                }
+            });
+        }
+
+        @Override
+        public void onSubmit(final AjaxRequestTarget target) {
+            try {
+                if (clientAppTO.getKey() == null) {
+                    ClientAppRestClient.create(type, clientAppTO);
+                } else {
+                    ClientAppRestClient.update(type, clientAppTO);
+                }
+                SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
+                Profile.this.modal.close(target);
+            } catch (Exception e) {
+                LOG.error("While creating/updating clientApp", e);
+                SyncopeConsoleSession.get().onException(e);
+            }
+            ((BaseWebPage) pageRef.getPage()).getNotificationPanel().refresh(target);
+        }
+    }
+}
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientApps.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientApps.java
new file mode 100644
index 0000000..8a69473
--- /dev/null
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientApps.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.clientapps;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+public class ClientApps extends Panel {
+
+    private static final long serialVersionUID = 1L;
+
+    public ClientApps(final String id, final PageReference pageRef) {
+        super(id);
+
+        add(new AjaxBootstrapTabbedPanel<>("clientApps", buildTabList(pageRef)));
+    }
+
+    private List<ITab> buildTabList(final PageReference pageRef) {
+        List<ITab> tabs = new ArrayList<>(3);
+
+        tabs.add(new AbstractTab(Model.of(ClientAppType.CASSP.name())) {
+
+            private static final long serialVersionUID = 5211692813425391144L;
+
+            @Override
+            public Panel getPanel(final String panelId) {
+                return new CASSPDirectoryPanel(panelId, pageRef);
+            }
+        });
+
+        tabs.add(new AbstractTab(Model.of(ClientAppType.SAML2SP.name())) {
+
+            private static final long serialVersionUID = 5211692813425391144L;
+
+            @Override
+            public Panel getPanel(final String panelId) {
+                return new SAML2SPDirectoryPanel(panelId, pageRef);
+            }
+        });
+
+        tabs.add(new AbstractTab(Model.of(ClientAppType.OIDCRP.name())) {
+
+            private static final long serialVersionUID = 5211692813425391144L;
+
+            @Override
+            public Panel getPanel(final String panelId) {
+                return new OIDCRPDirectoryPanel(panelId, pageRef);
+            }
+        });
+
+        return tabs;
+    }
+}
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
new file mode 100644
index 0000000..708e3aa
--- /dev/null
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.clientapps;
+
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.common.lib.to.OIDCRPTO;
+import org.apache.syncope.common.lib.types.AMEntitlement;
+import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.StringResourceModel;
+
+public class OIDCRPDirectoryPanel extends ClientAppDirectoryPanel<OIDCRPTO> {
+
+    private static final long serialVersionUID = 1L;
+
+    public OIDCRPDirectoryPanel(final String id, final PageReference pageRef) {
+        super(id, ClientAppType.OIDCRP, pageRef);
+
+        OIDCRPTO defaultItem = new OIDCRPTO();
+
+        this.addNewItemPanelBuilder(
+                new ClientAppModalPanelBuilder<>(ClientAppType.OIDCRP, defaultItem, modal, pageRef), true);
+        MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER, AMEntitlement.CLIENTAPP_CREATE);
+
+        initResultTable();
+    }
+
+    @Override
+    protected void addCustomColumnFields(final List<IColumn<OIDCRPTO, String>> columns) {
+        columns.add(new PropertyColumn<>(new StringResourceModel("clientId", this), "clientId", "clientId"));
+        columns.add(new PropertyColumn<>(
+                new StringResourceModel("redirectUris", this), "redirectUris", "redirectUris"));
+        columns.add(new AbstractColumn<OIDCRPTO, String>(new StringResourceModel("logout")) {
+
+            @Override
+            public void populateItem(
+                    final Item<ICellPopulator<OIDCRPTO>> item,
+                    final String componentId,
+                    final IModel<OIDCRPTO> rowModel) {
+
+                item.add(new Label(componentId, StringUtils.EMPTY));
+                if (StringUtils.isNotBlank(rowModel.getObject().getLogoutUri())) {
+                    item.add(new AttributeModifier("class", "fa fa-check"));
+                    item.add(new AttributeModifier("style", "display: table-cell; text-align: center;"));
+                }
+            }
+        });
+    }
+}
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java
new file mode 100644
index 0000000..19b8a90
--- /dev/null
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.clientapps;
+
+import java.util.List;
+import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.BooleanPropertyColumn;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.types.AMEntitlement;
+import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.StringResourceModel;
+
+public class SAML2SPDirectoryPanel extends ClientAppDirectoryPanel<SAML2SPTO> {
+
+    private static final long serialVersionUID = 1L;
+
+    public SAML2SPDirectoryPanel(final String id, final PageReference pageRef) {
+        super(id, ClientAppType.SAML2SP, pageRef);
+
+        SAML2SPTO defaultItem = new SAML2SPTO();
+
+        this.addNewItemPanelBuilder(
+                new ClientAppModalPanelBuilder<>(ClientAppType.SAML2SP, defaultItem, modal, pageRef), true);
+        MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER, AMEntitlement.CLIENTAPP_CREATE);
+
+        initResultTable();
+    }
+
+    @Override
+    protected void addCustomColumnFields(final List<IColumn<SAML2SPTO, String>> columns) {
+        columns.add(new PropertyColumn<>(new StringResourceModel("entityId", this), "entityId", "entityId"));
+        columns.add(new BooleanPropertyColumn<>(
+                new StringResourceModel("signAssertions", this), "signAssertions", "signAssertions"));
+        columns.add(new BooleanPropertyColumn<>(
+                new StringResourceModel("signResponses", this), "signResponses", "signResponses"));
+        columns.add(new BooleanPropertyColumn<>(
+                new StringResourceModel("encryptionOptional", this), "encryptionOptional", "encryptionOptional"));
+        columns.add(new BooleanPropertyColumn<>(
+                new StringResourceModel("encryptAssertions", this), "encryptAssertions", "encryptAssertions"));
+        columns.add(new PropertyColumn<>(
+                new StringResourceModel("requiredNameIdFormat", this), "requiredNameIdFormat", "requiredNameIdFormat"));
+    }
+}
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMConstants.java b/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMConstants.java
index 57f3e2e..9bb8e4e 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMConstants.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMConstants.java
@@ -26,6 +26,8 @@ public final class AMConstants {
 
     public static final String PREF_AUTHMODULE_PAGINATOR_ROWS = "authmodule.paginator.rows";
 
+    public static final String PREF_CLIENTAPP_PAGINATOR_ROWS = "clientapp.paginator.rows";
+
     private AMConstants() {
         // private constructor for static utility class
     }
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMRealmPolicyProvider.java b/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMRealmPolicyProvider.java
index 5590dfc..4dc3be5 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMRealmPolicyProvider.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/commons/AMRealmPolicyProvider.java
@@ -27,7 +27,7 @@ import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoiceP
 import org.apache.syncope.common.lib.policy.PolicyTO;
 import org.apache.syncope.common.lib.to.RealmTO;
 import org.apache.syncope.common.lib.types.PolicyType;
-import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.AbstractSingleSelectChoice;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
@@ -44,7 +44,7 @@ public class AMRealmPolicyProvider extends IdRepoRealmPolicyProvider {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.ACCESS).stream().
+            return PolicyRestClient.list(PolicyType.ACCESS).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -55,7 +55,7 @@ public class AMRealmPolicyProvider extends IdRepoRealmPolicyProvider {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.ATTR_RELEASE).stream().
+            return PolicyRestClient.list(PolicyType.ATTR_RELEASE).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -66,7 +66,7 @@ public class AMRealmPolicyProvider extends IdRepoRealmPolicyProvider {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.AUTH).stream().
+            return PolicyRestClient.list(PolicyType.AUTH).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -82,7 +82,7 @@ public class AMRealmPolicyProvider extends IdRepoRealmPolicyProvider {
                 false);
         accessPolicy.setChoiceRenderer(new PolicyRenderer(accessPolicies));
         accessPolicy.setChoices(new ArrayList<>(accessPolicies.getObject().keySet()));
-        ((DropDownChoice<?>) accessPolicy.getField()).setNullValid(true);
+        ((AbstractSingleSelectChoice<?>) accessPolicy.getField()).setNullValid(true);
         view.add(accessPolicy);
 
         AjaxDropDownChoicePanel<String> attrReleasePolicy = new AjaxDropDownChoicePanel<>(
@@ -92,7 +92,7 @@ public class AMRealmPolicyProvider extends IdRepoRealmPolicyProvider {
                 false);
         attrReleasePolicy.setChoiceRenderer(new PolicyRenderer(attrReleasePolicies));
         attrReleasePolicy.setChoices(new ArrayList<>(attrReleasePolicies.getObject().keySet()));
-        ((DropDownChoice<?>) attrReleasePolicy.getField()).setNullValid(true);
+        ((AbstractSingleSelectChoice<?>) attrReleasePolicy.getField()).setNullValid(true);
         view.add(attrReleasePolicy);
 
         AjaxDropDownChoicePanel<String> authPolicy = new AjaxDropDownChoicePanel<>(
@@ -102,7 +102,7 @@ public class AMRealmPolicyProvider extends IdRepoRealmPolicyProvider {
                 false);
         authPolicy.setChoiceRenderer(new PolicyRenderer(authPolicies));
         authPolicy.setChoices(new ArrayList<>(authPolicies.getObject().keySet()));
-        ((DropDownChoice<?>) authPolicy.getField()).setNullValid(true);
+        ((AbstractSingleSelectChoice<?>) authPolicy.getField()).setNullValid(true);
         view.add(authPolicy);
     }
 }
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/pages/WA.java b/client/am/console/src/main/java/org/apache/syncope/client/console/pages/WA.java
index b43b716..a316b7e 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/pages/WA.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/pages/WA.java
@@ -25,6 +25,7 @@ import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.annotations.AMPage;
 import org.apache.syncope.client.console.panels.AuthModuleDirectoryPanel;
+import org.apache.syncope.client.console.clientapps.ClientApps;
 import org.apache.syncope.client.console.panels.WAConfigDirectoryPanel;
 import org.apache.syncope.client.console.rest.WAConfigRestClient;
 import org.apache.syncope.client.ui.commons.Constants;
@@ -107,7 +108,7 @@ public class WA extends BasePage {
 
                 @Override
                 public Panel getPanel(final String panelId) {
-                    return new AjaxTextFieldPanel(panelId, panelId, Model.of(""));
+                    return new ClientApps(panelId, getPageReference());
                 }
             });
         }
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/SRARouteWizardBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/SRARouteWizardBuilder.java
index f05849b..6a0b6cd 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/SRARouteWizardBuilder.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/SRARouteWizardBuilder.java
@@ -123,9 +123,7 @@ public class SRARouteWizardBuilder extends BaseAjaxWizardBuilder<SRARouteTO> {
             type.addRequiredLabel().setEnabled(true);
             add(type);
 
-            AjaxCheckBoxPanel logout =
-                    new AjaxCheckBoxPanel("logout", "logout", new PropertyModel<>(route, "logout"));
-            add(logout);
+            add(new AjaxCheckBoxPanel("logout", "logout", new PropertyModel<>(route, "logout")));
 
             AjaxTextFieldPanel postLogout = new AjaxTextFieldPanel("postLogout", "postLogout", new IModel<String>() {
 
@@ -148,9 +146,7 @@ public class SRARouteWizardBuilder extends BaseAjaxWizardBuilder<SRARouteTO> {
             postLogout.getField().add(new UrlValidator(new String[] { "http", "https" }));
             add(postLogout);
 
-            AjaxCheckBoxPanel csrf =
-                    new AjaxCheckBoxPanel("csrf", "csrf", new PropertyModel<>(route, "csrf"));
-            add(csrf);
+            add(new AjaxCheckBoxPanel("csrf", "csrf", new PropertyModel<>(route, "csrf")));
 
             add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).build(
                     "order", "order", Integer.class, new PropertyModel<>(route, "order")).
@@ -158,21 +154,21 @@ public class SRARouteWizardBuilder extends BaseAjaxWizardBuilder<SRARouteTO> {
         }
     }
 
-    public static class Predicates extends WizardStep {
+    private static class Predicates extends WizardStep {
 
         private static final long serialVersionUID = 5934389493874714599L;
 
-        public Predicates(final SRARouteTO route) {
+        Predicates(final SRARouteTO route) {
             super(new ResourceModel("predicates"), Model.of());
             add(new SRARoutePredicatePanel("predicates", new ListModel<>(route.getPredicates())));
         }
     }
 
-    public static class Filters extends WizardStep {
+    private static class Filters extends WizardStep {
 
         private static final long serialVersionUID = -6552124285142294023L;
 
-        public Filters(final SRARouteTO route) {
+        Filters(final SRARouteTO route) {
             super(new ResourceModel("filters"), Model.of());
             add(new SRARouteFilterPanel("filters", new ListModel<>(route.getFilters())));
         }
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/ClientAppRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/ClientAppRestClient.java
new file mode 100644
index 0000000..af86193
--- /dev/null
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/ClientAppRestClient.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.rest;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.syncope.common.lib.to.ClientAppTO;
+import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.syncope.common.rest.api.service.ClientAppService;
+
+public class ClientAppRestClient extends BaseRestClient {
+
+    private static final long serialVersionUID = -1392090291817187902L;
+
+    private static final Comparator<ClientAppTO> COMPARATOR = Comparator.comparing(ClientAppTO::getName);
+
+    public static <T extends ClientAppTO> T read(final ClientAppType type, final String key) {
+        T policy = null;
+        try {
+            policy = getService(ClientAppService.class).read(type, key);
+        } catch (Exception e) {
+            LOG.warn("No client app found for type {} and key {}", type, key, e);
+        }
+        return policy;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends ClientAppTO> List<T> list(final ClientAppType type) {
+        try {
+            return getService(ClientAppService.class).<T>list(type).stream().
+                    sorted(COMPARATOR).
+                    collect(Collectors.toList());
+        } catch (Exception ignore) {
+            LOG.debug("No client app found", ignore);
+            return List.of();
+        }
+    }
+
+    public static <T extends ClientAppTO> void create(final ClientAppType type, final T policy) {
+        getService(ClientAppService.class).create(type, policy);
+    }
+
+    public static <T extends ClientAppTO> void update(final ClientAppType type, final T policy) {
+        getService(ClientAppService.class).update(type, policy);
+    }
+
+    public static void delete(final ClientAppType type, final String key) {
+        getService(ClientAppService.class).delete(type, key);
+    }
+}
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
new file mode 100644
index 0000000..d4fc071
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Name
+any.edit=Edit ${name}
+any.new=New Client App
+any.finish=Submit ${name}
+any.cancel=Cancel ${name}
+clientId=Client Id
+entityId=Entity Id
+serviceId=Service Id
+clientAppId=Id
+redirectUris=Redirect URIs
+logout=Logout
+signAssertions=Sign Assertions
+signResponses=Sign Responses
+encryptionOptional=Encryption Optional
+encryptAssertions=Encrypt Assertions
+requiredNameIdFormat=NameId Format
+clientSecret=Client Secret
+signIdToken=Sign IdToken
+subjectType=Subject Type
+supportedGrantTypes=Supported Grant Types
+supportedResponseTypes=Supported Reponse Types
+logoutUri=Logout URI
+metadataLocation=Metadata Location
+metadataSignatureLocation=Metadata Signature Location
+requiredAuthenticationContextClass=Authentication Context Class
+skewAllowance=Skew Allowance
+nameIdQualifier=NameId Qualifier
+assertionAudiences=Assertion Audiences
+serviceProviderNameIdQualifier=Service Provider NameId Qualifier
+signingSignatureAlgorithms=Signing Signature Algorithms
+signingSignatureReferenceDigestMethods=Signing Signature Reference Digest Methods
+encryptionDataAlgorithms=Encryption Data Algorithms
+encryptionKeyAlgorithms=Encryption Key Algorithms
+signingSignatureBlackListedAlgorithms=Signing Signature BlackListed Algorithms
+encryptionBlackListedAlgorithms=Encryption BlackListed Algorithms
+description=Description
+theme=Theme
+authPolicy=Authentication Policy
+accessPolicy=Access Policy
+attrReleasePolicy=Attribute Release Policy
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
new file mode 100644
index 0000000..a344081
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Nom
+any.edit=Modifier ${name}
+any.new=New Client App
+any.finish=Soumettre ${name}
+any.cancel=Annuler ${name}
+clientId=Client Id
+entityId=Entity Id
+serviceId=Service Id
+clientAppId=Id
+redirectUris=Redirect URIs
+logout=Logout
+signAssertions=Sign Assertions
+signResponses=Sign Responses
+encryptionOptional=Encryption Optional
+encryptAssertions=Encrypt Assertions
+requiredNameIdFormat=NameId Format
+clientSecret=Client Secret
+signIdToken=Sign IdToken
+subjectType=Subject Type
+supportedGrantTypes=Supported Grant Types
+supportedResponseTypes=Supported Reponse Types
+logoutUri=Logout URI
+metadataLocation=Metadata Location
+metadataSignatureLocation=Metadata Signature Location
+requiredAuthenticationContextClass=Authentication Context Class
+skewAllowance=Skew Allowance
+nameIdQualifier=NameId Qualifier
+assertionAudiences=Assertion Audiences
+serviceProviderNameIdQualifier=Service Provider NameId Qualifier
+signingSignatureAlgorithms=Signing Signature Algorithms
+signingSignatureReferenceDigestMethods=Signing Signature Reference Digest Methods
+encryptionDataAlgorithms=Encryption Data Algorithms
+encryptionKeyAlgorithms=Encryption Key Algorithms
+signingSignatureBlackListedAlgorithms=Signing Signature BlackListed Algorithms
+encryptionBlackListedAlgorithms=Encryption BlackListed Algorithms
+description=Description
+theme=Theme
+authPolicy=Authentication Policy
+accessPolicy=Access Policy
+attrReleasePolicy=Attribute Release Policy
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
new file mode 100644
index 0000000..e2d542b
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Nome
+any.edit=Modifica ${name}
+any.new=Nuova App Client
+any.finish=Invia ${name}
+any.cancel=Annulla ${name}
+clientId=Client Id
+entityId=Entity Id
+serviceId=Service Id
+clientAppId=Id
+redirectUris=URI di Redirect
+logout=Logout
+signAssertions=Firma Assertion
+signResponses=Firma Response
+encryptionOptional=Cifratura Opzionale
+encryptAssertions=Cifratura Assertion
+requiredNameIdFormat=Formato NameId
+clientSecret=Client Secret
+signIdToken=Firma IdToken
+subjectType=Tipo Subject
+supportedGrantTypes=Grant Type Supportati
+supportedResponseTypes=Reponse Type Supportati
+logoutUri=URI di Logout
+metadataLocation=Metadata Location
+metadataSignatureLocation=Metadata Signature Location
+requiredAuthenticationContextClass=Authentication Context Class
+skewAllowance=Skew Allowance
+nameIdQualifier=NameId Qualifier
+assertionAudiences=Assertion Audiences
+serviceProviderNameIdQualifier=Service Provider NameId Qualifier
+signingSignatureAlgorithms=Signing Signature Algorithms
+signingSignatureReferenceDigestMethods=Signing Signature Reference Digest Methods
+encryptionDataAlgorithms=Encryption Data Algorithms
+encryptionKeyAlgorithms=Encryption Key Algorithms
+signingSignatureBlackListedAlgorithms=Signing Signature BlackListed Algorithms
+encryptionBlackListedAlgorithms=Encryption BlackListed Algorithms
+description=Descrizione
+theme=Tema
+authPolicy=Politica Autenticazione
+accessPolicy=Politica Accesso
+attrReleasePolicy=Politica Rilascio Attributi
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
new file mode 100644
index 0000000..3fc7c34
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Name
+any.edit=${name} \u3092\u7de8\u96c6
+any.new=New Client App
+any.finish=${name} \u3092\u5b9f\u884c
+any.cancel=${name} \u3092\u30ad\u30e3\u30f3\u30bb\u30eb
+clientId=Client Id
+entityId=Entity Id
+serviceId=Service Id
+clientAppId=Id
+redirectUris=Redirect URIs
+logout=Logout
+signAssertions=Sign Assertions
+signResponses=Sign Responses
+encryptionOptional=Encryption Optional
+encryptAssertions=Encrypt Assertions
+requiredNameIdFormat=NameId Format
+clientSecret=Client Secret
+signIdToken=Sign IdToken
+subjectType=Subject Type
+supportedGrantTypes=Supported Grant Types
+supportedResponseTypes=Supported Reponse Types
+logoutUri=Logout URI
+metadataLocation=Metadata Location
+metadataSignatureLocation=Metadata Signature Location
+requiredAuthenticationContextClass=Authentication Context Class
+skewAllowance=Skew Allowance
+nameIdQualifier=NameId Qualifier
+assertionAudiences=Assertion Audiences
+serviceProviderNameIdQualifier=Service Provider NameId Qualifier
+signingSignatureAlgorithms=Signing Signature Algorithms
+signingSignatureReferenceDigestMethods=Signing Signature Reference Digest Methods
+encryptionDataAlgorithms=Encryption Data Algorithms
+encryptionKeyAlgorithms=Encryption Key Algorithms
+signingSignatureBlackListedAlgorithms=Signing Signature BlackListed Algorithms
+encryptionBlackListedAlgorithms=Encryption BlackListed Algorithms
+description=Description
+theme=Theme
+authPolicy=Authentication Policy
+accessPolicy=Access Policy
+attrReleasePolicy=Attribute Release Policy
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
new file mode 100644
index 0000000..d4fc071
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Name
+any.edit=Edit ${name}
+any.new=New Client App
+any.finish=Submit ${name}
+any.cancel=Cancel ${name}
+clientId=Client Id
+entityId=Entity Id
+serviceId=Service Id
+clientAppId=Id
+redirectUris=Redirect URIs
+logout=Logout
+signAssertions=Sign Assertions
+signResponses=Sign Responses
+encryptionOptional=Encryption Optional
+encryptAssertions=Encrypt Assertions
+requiredNameIdFormat=NameId Format
+clientSecret=Client Secret
+signIdToken=Sign IdToken
+subjectType=Subject Type
+supportedGrantTypes=Supported Grant Types
+supportedResponseTypes=Supported Reponse Types
+logoutUri=Logout URI
+metadataLocation=Metadata Location
+metadataSignatureLocation=Metadata Signature Location
+requiredAuthenticationContextClass=Authentication Context Class
+skewAllowance=Skew Allowance
+nameIdQualifier=NameId Qualifier
+assertionAudiences=Assertion Audiences
+serviceProviderNameIdQualifier=Service Provider NameId Qualifier
+signingSignatureAlgorithms=Signing Signature Algorithms
+signingSignatureReferenceDigestMethods=Signing Signature Reference Digest Methods
+encryptionDataAlgorithms=Encryption Data Algorithms
+encryptionKeyAlgorithms=Encryption Key Algorithms
+signingSignatureBlackListedAlgorithms=Signing Signature BlackListed Algorithms
+encryptionBlackListedAlgorithms=Encryption BlackListed Algorithms
+description=Description
+theme=Theme
+authPolicy=Authentication Policy
+accessPolicy=Access Policy
+attrReleasePolicy=Attribute Release Policy
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
new file mode 100644
index 0000000..1727710
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+name=Name
+any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${name}
+any.new=New Client App
+any.finish=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c ${name}
+any.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c ${name}
+clientId=Client Id
+entityId=Entity Id
+serviceId=Service Id
+clientAppId=Id
+redirectUris=Redirect URIs
+logout=Logout
+signAssertions=Sign Assertions
+signResponses=Sign Responses
+encryptionOptional=Encryption Optional
+encryptAssertions=Encrypt Assertions
+requiredNameIdFormat=NameId Format
+clientSecret=Client Secret
+signIdToken=Sign IdToken
+subjectType=Subject Type
+supportedGrantTypes=Supported Grant Types
+supportedResponseTypes=Supported Reponse Types
+logoutUri=Logout URI
+metadataLocation=Metadata Location
+metadataSignatureLocation=Metadata Signature Location
+requiredAuthenticationContextClass=Authentication Context Class
+skewAllowance=Skew Allowance
+nameIdQualifier=NameId Qualifier
+assertionAudiences=Assertion Audiences
+serviceProviderNameIdQualifier=Service Provider NameId Qualifier
+signingSignatureAlgorithms=Signing Signature Algorithms
+signingSignatureReferenceDigestMethods=Signing Signature Reference Digest Methods
+encryptionDataAlgorithms=Encryption Data Algorithms
+encryptionKeyAlgorithms=Encryption Key Algorithms
+signingSignatureBlackListedAlgorithms=Signing Signature BlackListed Algorithms
+encryptionBlackListedAlgorithms=Encryption BlackListed Algorithms
+description=Description
+theme=Theme
+authPolicy=Authentication Policy
+accessPolicy=Access Policy
+attrReleasePolicy=Attribute Release Policy
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder$Profile.html b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder$Profile.html
new file mode 100644
index 0000000..78bd426
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder$Profile.html
@@ -0,0 +1,27 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div wicket:id="fields">
+      <div class="form-group">
+        <span wicket:id="field"/>
+      </div>
+    </div>
+  </wicket:panel>
+</html>
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientApps.html b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientApps.html
new file mode 100644
index 0000000..391f817
--- /dev/null
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientApps.html
@@ -0,0 +1,23 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div wicket:id="clientApps"/>
+  </wicket:panel>
+</html>
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java
index 18d2469..9a37142 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java
@@ -159,7 +159,7 @@ public class ProvisioningPolicyModalPanel extends AbstractModalPanel<Provisionin
                     }
                 }
             });
-            PolicyRestClient.updatePolicy(getItem() instanceof PullPolicyTO
+            PolicyRestClient.update(getItem() instanceof PullPolicyTO
                     ? PolicyType.PULL : PolicyType.PUSH, getItem());
 
             SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
index 6605691..2a8374c 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
@@ -77,8 +77,7 @@ public class LinkedAccountPlainAttrsPanel extends AbstractAttrsWizardStep<PlainS
         super(userTO,
                 AjaxWizard.Mode.EDIT,
                 AnyTypeRestClient.read(userTO.getType()).getClasses(),
-                whichPlainAttrs,
-                modelObject);
+                whichPlainAttrs);
 
         this.linkedAccountTO = modelObject.getInnerObject();
         this.fixedAttrs.addAll(this.linkedAccountTO.getPlainAttrs().stream().
@@ -239,7 +238,7 @@ public class LinkedAccountPlainAttrsPanel extends AbstractAttrsWizardStep<PlainS
                 final Map<String, PlainSchemaTO> schemas,
                 final IModel<List<Attr>> attrTOs) {
 
-            super(id, schemas, attrTOs);
+            super(id);
 
             add(new ListView<Attr>("schemas", attrTOs) {
 
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
index 5b33177..792ffd0 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
@@ -126,7 +126,7 @@ public class ProvisionWizardBuilder extends BaseAjaxWizardBuilder<ResourceProvis
 
         private static final long serialVersionUID = 3454904947720856253L;
 
-        Mapping(final ResourceProvision resourceProvision) {
+        Mapping() {
             setTitleModel(Model.of("Mapping"));
             setSummaryModel(Model.of(StringUtils.EMPTY));
         }
@@ -203,7 +203,7 @@ public class ProvisionWizardBuilder extends BaseAjaxWizardBuilder<ResourceProvis
         wizardModel.add(new ObjectType(resourceProvision));
         wizardModel.add(new AuxClasses(resourceProvision));
 
-        Mapping mapping = new Mapping(resourceProvision);
+        Mapping mapping = new Mapping();
         mapping.setOutputMarkupId(true);
 
         ItemTransformersTogglePanel itemTransformers = new ItemTransformersTogglePanel(mapping, pageRef);
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceSecurityPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceSecurityPanel.java
index 92420b9..2f7e098 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceSecurityPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceSecurityPanel.java
@@ -45,7 +45,7 @@ public class ResourceSecurityPanel extends WizardStep {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.PASSWORD).stream().
+            return PolicyRestClient.list(PolicyType.PASSWORD).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -56,7 +56,7 @@ public class ResourceSecurityPanel extends WizardStep {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.ACCOUNT).stream().
+            return PolicyRestClient.list(PolicyType.ACCOUNT).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -67,7 +67,7 @@ public class ResourceSecurityPanel extends WizardStep {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.PULL).stream().
+            return PolicyRestClient.list(PolicyType.PULL).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -78,7 +78,7 @@ public class ResourceSecurityPanel extends WizardStep {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.PUSH).stream().
+            return PolicyRestClient.list(PolicyType.PUSH).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
index 7e1ca1b..eb9872a 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
@@ -194,9 +194,16 @@ public class SyncopeWebApplication extends WicketBootSecuredWebApplication {
 
         useGZIPCompression = BooleanUtils.toBoolean(props.getProperty("useGZIPCompression"));
         Args.notNull(useGZIPCompression, "<useGZIPCompression>");
-        maxUploadFileSizeMB = props.getProperty("maxUploadFileSizeMB") == null
-                ? null
-                : Integer.valueOf(props.getProperty("maxUploadFileSizeMB"));
+
+        try {
+            maxUploadFileSizeMB = props.getProperty("maxUploadFileSizeMB") == null
+                    ? null
+                    : Integer.valueOf(props.getProperty("maxUploadFileSizeMB"));
+        } catch (NumberFormatException e) {
+            LOG.error("Invalid value provided for 'maxUploadFileSizeMB': {}",
+                    props.getProperty("maxUploadFileSizeMB"));
+            maxUploadFileSizeMB = null;
+        }
 
         try {
             maxWaitTime = Integer.valueOf(props.getProperty("maxWaitTimeOnApplyChanges", "30"));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoRealmPolicyProvider.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoRealmPolicyProvider.java
index 7a9abbb..e7666ad 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoRealmPolicyProvider.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoRealmPolicyProvider.java
@@ -27,7 +27,7 @@ import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoiceP
 import org.apache.syncope.common.lib.policy.PolicyTO;
 import org.apache.syncope.common.lib.to.RealmTO;
 import org.apache.syncope.common.lib.types.PolicyType;
-import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.AbstractSingleSelectChoice;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
@@ -44,7 +44,7 @@ public class IdRepoRealmPolicyProvider implements RealmPolicyProvider {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.ACCOUNT).stream().
+            return PolicyRestClient.list(PolicyType.ACCOUNT).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -55,7 +55,7 @@ public class IdRepoRealmPolicyProvider implements RealmPolicyProvider {
 
         @Override
         protected Map<String, String> load() {
-            return PolicyRestClient.getPolicies(PolicyType.PASSWORD).stream().
+            return PolicyRestClient.list(PolicyType.PASSWORD).stream().
                     collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getDescription));
         }
     };
@@ -69,7 +69,7 @@ public class IdRepoRealmPolicyProvider implements RealmPolicyProvider {
                 false);
         accountPolicy.setChoiceRenderer(new PolicyRenderer(accountPolicies));
         accountPolicy.setChoices(new ArrayList<>(accountPolicies.getObject().keySet()));
-        ((DropDownChoice<?>) accountPolicy.getField()).setNullValid(true);
+        ((AbstractSingleSelectChoice<?>) accountPolicy.getField()).setNullValid(true);
         view.add(accountPolicy);
 
         AjaxDropDownChoicePanel<String> passwordPolicy = new AjaxDropDownChoicePanel<>(
@@ -79,7 +79,7 @@ public class IdRepoRealmPolicyProvider implements RealmPolicyProvider {
                 false);
         passwordPolicy.setChoiceRenderer(new PolicyRenderer(passwordPolicies));
         passwordPolicy.setChoices(new ArrayList<>(passwordPolicies.getObject().keySet()));
-        ((DropDownChoice<?>) passwordPolicy.getField()).setNullValid(true);
+        ((AbstractSingleSelectChoice<?>) passwordPolicy.getField()).setNullValid(true);
         view.add(passwordPolicy);
     }
 }
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java
index a7707ac..eef709e 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java
@@ -118,7 +118,7 @@ public class BeanPanel<T extends Serializable> extends Panel {
 
             private static final long serialVersionUID = 9101744072914090143L;
 
-            @SuppressWarnings({ "unchecked", "rawtypes" })
+            @SuppressWarnings({"unchecked", "rawtypes"})
             @Override
             protected void populateItem(final ListItem<String> item) {
                 final String fieldName = item.getModelObject();
@@ -231,7 +231,7 @@ public class BeanPanel<T extends Serializable> extends Panel {
         }.setReuseItems(true).setOutputMarkupId(true));
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     private static FieldPanel buildSinglePanel(
             final Serializable bean, final Class<?> type, final String fieldName, final String id) {
 
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
index 52bee10..7491521 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
@@ -316,7 +316,12 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel {
             final AjaxTextFieldPanel secretKey, final AjaxDropDownChoicePanel<CipherAlgorithm> cipherAlgorithm,
             final WebMarkupContainer binaryParams, final AjaxTextFieldPanel mimeType) {
 
-        int typeOrdinal = Integer.parseInt(type.getField().getValue());
+        int typeOrdinal = -1;
+        try {
+            typeOrdinal = Integer.parseInt(type.getField().getValue());
+        } catch (NumberFormatException e) {
+            LOG.error("Invalid value found: {}", type.getField().getValue(), e);
+        }
         if (AttrSchemaType.Long.ordinal() == typeOrdinal
                 || AttrSchemaType.Double.ordinal() == typeOrdinal
                 || AttrSchemaType.Date.ordinal() == typeOrdinal) {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
index 67b3056..5e41154 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
@@ -72,16 +72,15 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
             super.onConfigure();
             setFooterVisible(false);
         }
-
     };
 
     protected final BaseModal<T> policySpecModal = new BaseModal<>(Constants.OUTER);
 
     private final PolicyType type;
 
-    public PolicyDirectoryPanel(final String id, final PolicyType policyType, final PageReference pageRef) {
+    public PolicyDirectoryPanel(final String id, final PolicyType type, final PageReference pageRef) {
         super(id, pageRef, true);
-        this.type = policyType;
+        this.type = type;
         this.restClient = new PolicyRestClient();
 
         ruleCompositionModal.size(Modal.Size.Large);
@@ -138,7 +137,7 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
             public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) {
                 send(PolicyDirectoryPanel.this, Broadcast.EXACT,
                         new AjaxWizard.EditItemActionEvent<>(
-                                PolicyRestClient.getPolicy(type, model.getObject().getKey()), target));
+                                PolicyRestClient.read(type, model.getObject().getKey()), target));
             }
         }, ActionLink.ActionType.EDIT, IdRepoEntitlement.POLICY_UPDATE);
 
@@ -163,7 +162,7 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
 
             @Override
             public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) {
-                final T policyTO = model.getObject();
+                T policyTO = model.getObject();
                 try {
                     PolicyRestClient.delete(type, policyTO.getKey());
                     SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
@@ -215,14 +214,14 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
 
         @Override
         public Iterator<T> iterator(final long first, final long count) {
-            List<T> list = PolicyRestClient.getPolicies(type);
+            List<T> list = PolicyRestClient.list(type);
             list.sort(comparator);
             return list.subList((int) first, (int) first + (int) count).iterator();
         }
 
         @Override
         public long size() {
-            return PolicyRestClient.getPolicies(type).size();
+            return PolicyRestClient.list(type).size();
         }
 
         @Override
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
index 49dcfbf..d6cb105 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
@@ -24,7 +24,6 @@ import java.util.List;
 import org.apache.syncope.client.console.SyncopeWebApplication;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.ui.commons.Constants;
-import org.apache.syncope.client.console.pages.BasePage;
 import org.apache.syncope.client.console.panels.AbstractModalPanel;
 import org.apache.syncope.client.console.rest.PolicyRestClient;
 import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -33,14 +32,11 @@ import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoiceP
 import org.apache.syncope.client.ui.commons.markup.html.form.AjaxPalettePanel;
 import org.apache.syncope.client.ui.commons.markup.html.form.AjaxSpinnerFieldPanel;
 import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel;
+import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
 import org.apache.syncope.client.ui.commons.wizards.AbstractModalPanelBuilder;
 import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
 import org.apache.syncope.client.ui.commons.panels.WizardModalPanel;
 import org.apache.syncope.common.lib.policy.PolicyTO;
-import org.apache.syncope.common.lib.policy.AccountPolicyTO;
-import org.apache.syncope.common.lib.policy.PasswordPolicyTO;
-import org.apache.syncope.common.lib.policy.ProvisioningPolicyTO;
 import org.apache.syncope.common.lib.types.ConflictResolutionAction;
 import org.apache.syncope.common.lib.types.PolicyType;
 import org.apache.wicket.Component;
@@ -73,7 +69,7 @@ public class PolicyModalPanelBuilder<T extends PolicyTO> extends AbstractModalPa
         return new Profile(newModelObject(), modal, pageRef);
     }
 
-    public class Profile extends AbstractModalPanel<T> {
+    private class Profile extends AbstractModalPanel<T> {
 
         private static final long serialVersionUID = -3043839139187792810L;
 
@@ -89,54 +85,70 @@ public class PolicyModalPanelBuilder<T extends PolicyTO> extends AbstractModalPa
             }
         };
 
-        public Profile(final T policyTO, final BaseModal<T> modal, final PageReference pageRef) {
+        Profile(final T policyTO, final BaseModal<T> modal, final PageReference pageRef) {
             super(modal, pageRef);
             modal.setFormModel(policyTO);
 
             this.policyTO = policyTO;
 
-            final List<Component> fields = new ArrayList<>();
-
-            FieldPanel<String> description = new AjaxTextFieldPanel("field", "description",
-                    new PropertyModel<>(policyTO, "description"), false);
-            description.setRequired(true);
-            fields.add(description);
-
-            if (policyTO instanceof AccountPolicyTO) {
-                fields.add(new AjaxSpinnerFieldPanel.Builder<Integer>().build(
-                        "field",
-                        "maxAuthenticationAttempts",
-                        Integer.class,
-                        new PropertyModel<>(policyTO, "maxAuthenticationAttempts")));
-
-                fields.add(new AjaxCheckBoxPanel(
-                        "field",
-                        "propagateSuspension",
-                        new PropertyModel<>(policyTO, "propagateSuspension"),
-                        false));
-
-                fields.add(new AjaxPalettePanel.Builder<String>().setName("passthroughResources").build(
-                        "field",
-                        new PropertyModel<>(policyTO, "passthroughResources"),
-                        new ListModel<>(resources.getObject())));
-            } else if (policyTO instanceof PasswordPolicyTO) {
-                fields.add(new AjaxSpinnerFieldPanel.Builder<Integer>().build(
-                        "field",
-                        "historyLength",
-                        Integer.class,
-                        new PropertyModel<>(policyTO, "historyLength")));
-
-                fields.add(new AjaxCheckBoxPanel(
-                        "field",
-                        "allowNullPassword",
-                        new PropertyModel<>(policyTO, "allowNullPassword"),
-                        false));
-            } else if (policyTO instanceof ProvisioningPolicyTO) {
-                fields.add(new AjaxDropDownChoicePanel<>(
-                        "field",
-                        "conflictResolutionAction",
-                        new PropertyModel<>(policyTO, "conflictResolutionAction")).
-                        setChoices(List.of((Serializable[]) ConflictResolutionAction.values())));
+            List<Component> fields = new ArrayList<>();
+
+            fields.add(new AjaxTextFieldPanel("field", "description",
+                    new PropertyModel<>(policyTO, "description"), false).setRequired(true));
+
+            switch (type) {
+                case ACCOUNT:
+                    fields.add(new AjaxSpinnerFieldPanel.Builder<Integer>().build(
+                            "field",
+                            "maxAuthenticationAttempts",
+                            Integer.class,
+                            new PropertyModel<>(policyTO, "maxAuthenticationAttempts")));
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field",
+                            "propagateSuspension",
+                            new PropertyModel<>(policyTO, "propagateSuspension"),
+                            false));
+
+                    fields.add(new AjaxPalettePanel.Builder<String>().setName("passthroughResources").build(
+                            "field",
+                            new PropertyModel<>(policyTO, "passthroughResources"),
+                            new ListModel<>(resources.getObject())));
+                    break;
+
+                case PASSWORD:
+                    fields.add(new AjaxSpinnerFieldPanel.Builder<Integer>().build(
+                            "field",
+                            "historyLength",
+                            Integer.class,
+                            new PropertyModel<>(policyTO, "historyLength")));
+
+                    fields.add(new AjaxCheckBoxPanel(
+                            "field",
+                            "allowNullPassword",
+                            new PropertyModel<>(policyTO, "allowNullPassword"),
+                            false));
+                    break;
+
+                case PULL:
+                case PUSH:
+                    fields.add(new AjaxDropDownChoicePanel<>(
+                            "field",
+                            "conflictResolutionAction",
+                            new PropertyModel<>(policyTO, "conflictResolutionAction")).
+                            setChoices(List.of((Serializable[]) ConflictResolutionAction.values())));
+                    break;
+
+                case ACCESS:
+                    break;
+
+                case ATTR_RELEASE:
+                    break;
+
+                case AUTH:
+                    break;
+
+                default:
             }
 
             add(new ListView<Component>("fields", fields) {
@@ -147,7 +159,6 @@ public class PolicyModalPanelBuilder<T extends PolicyTO> extends AbstractModalPa
                 protected void populateItem(final ListItem<Component> item) {
                     item.add(item.getModelObject());
                 }
-
             });
         }
 
@@ -155,9 +166,9 @@ public class PolicyModalPanelBuilder<T extends PolicyTO> extends AbstractModalPa
         public void onSubmit(final AjaxRequestTarget target) {
             try {
                 if (policyTO.getKey() == null) {
-                    PolicyRestClient.createPolicy(type, policyTO);
+                    PolicyRestClient.create(type, policyTO);
                 } else {
-                    PolicyRestClient.updatePolicy(type, policyTO);
+                    PolicyRestClient.update(type, policyTO);
                 }
                 SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
                 Profile.this.modal.close(target);
@@ -165,7 +176,7 @@ public class PolicyModalPanelBuilder<T extends PolicyTO> extends AbstractModalPa
                 LOG.error("While creating/updating policy", e);
                 SyncopeConsoleSession.get().onException(e);
             }
-            ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
+            ((BaseWebPage) pageRef.getPage()).getNotificationPanel().refresh(target);
         }
     }
 }
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
index f67f1d5..ccda550 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
@@ -162,10 +162,10 @@ public class PolicyRuleDirectoryPanel<T extends PolicyTO> extends DirectoryPanel
             public void onClick(final AjaxRequestTarget target, final PolicyRuleWrapper ignore) {
                 RuleConf rule = model.getObject().getConf();
                 try {
-                    T actual = PolicyRestClient.getPolicy(type, policy);
+                    T actual = PolicyRestClient.read(type, policy);
                     if (actual instanceof ComposablePolicy) {
                         ((ComposablePolicy) actual).getRules().remove(model.getObject().getImplementationKey());
-                        PolicyRestClient.updatePolicy(type, actual);
+                        PolicyRestClient.update(type, actual);
 
                         SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
                         customActionOnFinishCallback(target);
@@ -251,7 +251,7 @@ public class PolicyRuleDirectoryPanel<T extends PolicyTO> extends DirectoryPanel
 
         @Override
         public Iterator<PolicyRuleWrapper> iterator(final long first, final long count) {
-            final T actual = PolicyRestClient.getPolicy(type, policy);
+            final T actual = PolicyRestClient.read(type, policy);
 
             List<PolicyRuleWrapper> rules = actual instanceof ComposablePolicy
                     ? getPolicyRuleWrappers((ComposablePolicy) actual)
@@ -263,7 +263,7 @@ public class PolicyRuleDirectoryPanel<T extends PolicyTO> extends DirectoryPanel
 
         @Override
         public long size() {
-            final T actual = PolicyRestClient.getPolicy(type, policy);
+            final T actual = PolicyRestClient.read(type, policy);
             return actual instanceof ComposablePolicy
                     ? getPolicyRuleWrappers((ComposablePolicy) actual).size()
                     : 0;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
index dda0436..25c2300 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
@@ -75,7 +75,7 @@ public class PolicyRuleWizardBuilder extends BaseAjaxWizardBuilder<PolicyRuleWra
 
     @Override
     protected Serializable onApplyInternal(final PolicyRuleWrapper modelObject) {
-        PolicyTO policyTO = PolicyRestClient.getPolicy(type, policy);
+        PolicyTO policyTO = PolicyRestClient.read(type, policy);
 
         ComposablePolicy composable;
         if (policyTO instanceof ComposablePolicy) {
@@ -99,7 +99,7 @@ public class PolicyRuleWizardBuilder extends BaseAjaxWizardBuilder<PolicyRuleWra
             composable.getRules().add(modelObject.getImplementationKey());
         }
 
-        PolicyRestClient.updatePolicy(type, policyTO);
+        PolicyRestClient.update(type, policyTO);
         return modelObject;
     }
 
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index 8e5521a..8ae9c67 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -141,7 +141,7 @@ public abstract class ReportDirectoryPanel
                 Component panel;
                 try {
                     JobTO jobTO = ReportRestClient.getJob(rowModel.getObject().getKey());
-                    panel = new JobActionPanel(componentId, jobTO, false, ReportDirectoryPanel.this, pageRef);
+                    panel = new JobActionPanel(componentId, jobTO, false, ReportDirectoryPanel.this);
                     MetaDataRoleAuthorizationStrategy.authorize(panel, WebPage.ENABLE,
                             String.format("%s,%s",
                                     IdRepoEntitlement.REPORT_EXECUTE,
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
index 11a4c6b..acf4912 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
@@ -18,10 +18,8 @@
  */
 package org.apache.syncope.client.console.rest;
 
-import java.io.Serializable;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.syncope.common.lib.policy.PolicyTO;
 import org.apache.syncope.common.lib.types.PolicyType;
@@ -34,20 +32,20 @@ public class PolicyRestClient extends BaseRestClient {
 
     private static final long serialVersionUID = -1392090291817187902L;
 
-    private static final PolicyComparator COMPARATOR = new PolicyComparator();
+    private static final Comparator<PolicyTO> COMPARATOR = Comparator.comparing(PolicyTO::getDescription);
 
-    public static <T extends PolicyTO> T getPolicy(final PolicyType type, final String key) {
+    public static <T extends PolicyTO> T read(final PolicyType type, final String key) {
         T policy = null;
         try {
             policy = getService(PolicyService.class).read(type, key);
         } catch (Exception e) {
-            LOG.warn("No policy found for id {}", key, e);
+            LOG.warn("No policy found for type {} and key {}", type, key, e);
         }
         return policy;
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends PolicyTO> List<T> getPolicies(final PolicyType type) {
+    public static <T extends PolicyTO> List<T> list(final PolicyType type) {
         try {
             return getService(PolicyService.class).<T>list(type).stream().
                     sorted(COMPARATOR).
@@ -58,27 +56,15 @@ public class PolicyRestClient extends BaseRestClient {
         }
     }
 
-    public static <T extends PolicyTO> void createPolicy(final PolicyType type, final T policy) {
+    public static <T extends PolicyTO> void create(final PolicyType type, final T policy) {
         getService(PolicyService.class).create(type, policy);
     }
 
-    public static <T extends PolicyTO> void updatePolicy(final PolicyType type, final T policy) {
+    public static <T extends PolicyTO> void update(final PolicyType type, final T policy) {
         getService(PolicyService.class).update(type, policy);
     }
 
     public static void delete(final PolicyType type, final String key) {
         getService(PolicyService.class).delete(type, key);
     }
-
-    private static class PolicyComparator implements Comparator<PolicyTO>, Serializable {
-
-        private static final long serialVersionUID = -4921433085213223115L;
-
-        @Override
-        public int compare(final PolicyTO left, final PolicyTO right) {
-            return Optional.ofNullable(left).map(to -> Optional.ofNullable(right).
-                    map(policyTO -> to.getDescription().compareTo(policyTO.getDescription())).orElse(1)).
-                    orElse(-1);
-        }
-    }
 }
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
index d31aefa..279418d 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
@@ -144,7 +144,7 @@ public abstract class ProvisioningTaskDirectoryPanel<T extends ProvisioningTaskT
                 Component panel;
                 try {
                     JobTO jobTO = TaskRestClient.getJob(rowModel.getObject().getKey());
-                    panel = new JobActionPanel(componentId, jobTO, false, ProvisioningTaskDirectoryPanel.this, pageRef);
+                    panel = new JobActionPanel(componentId, jobTO, false, ProvisioningTaskDirectoryPanel.this);
                     MetaDataRoleAuthorizationStrategy.authorize(
                             panel, WebPage.ENABLE,
                             String.format("%s,%s", IdRepoEntitlement.TASK_EXECUTE, IdRepoEntitlement.TASK_UPDATE));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index 4885cee..4bc548b 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -204,7 +204,7 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
                 Component panel;
                 try {
                     JobTO jobTO = restClient.getJob(rowModel.getObject().getKey());
-                    panel = new JobActionPanel(componentId, jobTO, false, SchedTaskDirectoryPanel.this, pageRef);
+                    panel = new JobActionPanel(componentId, jobTO, false, SchedTaskDirectoryPanel.this);
                     MetaDataRoleAuthorizationStrategy.authorize(
                             panel, WebPage.ENABLE,
                             String.format("%s,%s", IdRepoEntitlement.TASK_EXECUTE, IdRepoEntitlement.TASK_UPDATE));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
index 904303e..4b4af91 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
@@ -72,7 +72,15 @@ public abstract class AlertWidget<T extends Serializable> extends Panel {
             @Override
             protected void onComponentTag(final ComponentTag tag) {
                 super.onComponentTag(tag);
-                if (Integer.parseInt(getDefaultModelObject().toString()) > 0) {
+
+                boolean warning = false;
+                try {
+                    warning = Integer.parseInt(getDefaultModelObject().toString()) > 0;
+                } catch (Exception e) {
+                    LOG.error("Invalid value found: {}", getDefaultModelObject(), e);
+                }
+
+                if (warning) {
                     tag.put("class", "badge badge-warning navbar-badge");
                 } else {
                     tag.put("class", "badge badge-success navbar-badge");
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
index 1e1d551..58e5b7c 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
@@ -34,7 +34,6 @@ import org.apache.syncope.client.console.wizards.WizardMgtPanel;
 import org.apache.syncope.common.lib.to.JobTO;
 import org.apache.syncope.common.lib.types.JobAction;
 import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.event.Broadcast;
 import org.apache.wicket.markup.html.basic.Label;
@@ -53,8 +52,7 @@ public class JobActionPanel extends WizardMgtPanel<Serializable> {
             final String id,
             final JobTO jobTO,
             final boolean showNotRunning,
-            final Component container,
-            final PageReference pageRef) {
+            final Component container) {
 
         super(id, true);
         setOutputMarkupId(true);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
index 65c4c0e..934eb46 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
@@ -354,7 +354,7 @@ public class JobWidget extends BaseWidget {
                         final IModel<JobTO> rowModel) {
 
                     JobTO jobTO = rowModel.getObject();
-                    JobActionPanel panel = new JobActionPanel(componentId, jobTO, true, JobWidget.this, pageRef);
+                    JobActionPanel panel = new JobActionPanel(componentId, jobTO, true, JobWidget.this);
 
                     String roles;
                     switch (jobTO.getType()) {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 2f266e7..5f0c422 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
 import org.apache.syncope.client.console.rest.GroupRestClient;
 import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
 import org.apache.syncope.client.ui.commons.wizards.any.AnyWrapper;
@@ -61,7 +62,7 @@ public abstract class AbstractAttrs<S extends SchemaTO> extends AbstractAttrsWiz
             final List<String> anyTypeClasses,
             final List<String> whichAttrs) {
 
-        super(modelObject.getInnerObject(), mode, anyTypeClasses, whichAttrs, null);
+        super(modelObject.getInnerObject(), mode, anyTypeClasses, whichAttrs);
 
         this.memberships = new ListModel<>(List.of());
 
@@ -76,7 +77,7 @@ public abstract class AbstractAttrs<S extends SchemaTO> extends AbstractAttrsWiz
         try {
             ((List<MembershipTO>) PropertyResolver.getPropertyField("memberships", anyTO).get(anyTO)).forEach(memb -> {
                 setSchemas(memb.getGroupKey(),
-                        anyTypeClassRestClient.list(getMembershipAuxClasses(memb, anyTO.getType())).
+                        AnyTypeClassRestClient.list(getMembershipAuxClasses(memb, anyTO.getType())).
                                 stream().map(EntityTO::getKey).collect(Collectors.toList()));
                 setAttrs(memb);
 
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
index 5cd5e69..f4ae2c3 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
@@ -47,7 +47,6 @@ import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.client.ui.commons.markup.html.form.EncryptedFieldPanel;
 import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel;
 import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
-import org.apache.syncope.client.ui.commons.wizards.any.EntityWrapper;
 import org.apache.syncope.common.lib.Attr;
 import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.syncope.common.lib.to.SchemaTO;
@@ -76,8 +75,6 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
 
     protected final Comparator<Attr> attrComparator = new AttrComparator();
 
-    protected final AnyTypeClassRestClient anyTypeClassRestClient = new AnyTypeClassRestClient();
-
     protected final AnyTO anyTO;
 
     protected AnyTO previousObject;
@@ -98,8 +95,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
             final AnyTO anyTO,
             final AjaxWizard.Mode mode,
             final List<String> anyTypeClasses,
-            final List<String> whichAttrs,
-            final EntityWrapper<?> modelObject) {
+            final List<String> whichAttrs) {
 
         super();
         this.anyTypeClasses = anyTypeClasses;
@@ -390,11 +386,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
 
         private static final long serialVersionUID = 8315035592714180404L;
 
-        public PlainSchemas(
-                final String id,
-                final Map<String, PlainSchemaTO> schemas,
-                final IModel<T> attrs) {
-
+        public PlainSchemas(final String id) {
             super(id);
         }
 
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index b9dcda3..825cd24 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -194,7 +194,7 @@ public class PlainAttrs extends AbstractAttrs<PlainSchemaTO> {
                 final Map<String, PlainSchemaTO> schemas,
                 final IModel<List<Attr>> attrTOs) {
 
-            super(id, schemas, attrTOs);
+            super(id);
 
             add(new ListView<Attr>("schemas", attrTOs) {
 
@@ -218,7 +218,7 @@ public class PlainAttrs extends AbstractAttrs<PlainSchemaTO> {
                 final Map<String, PlainSchemaTO> schemas,
                 final IModel<Attributable> attributableTO) {
 
-            super(id, schemas, attributableTO);
+            super(id);
 
             add(new ListView<Attr>("schemas", new ListModel<Attr>(attributableTO.getObject().
                     getPlainAttrs().stream().sorted(attrComparator).collect(Collectors.toList()))) {
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/AnyLayoutUtils.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/AnyLayoutUtils.java
index 4929901..5739f02 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/AnyLayoutUtils.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/AnyLayoutUtils.java
@@ -63,7 +63,7 @@ public final class AnyLayoutUtils {
         }
     }
 
-    public static String defaultConsoleLayoutInfoIfEmpty(final String content, final List<String> anyTypes) {
+    public static String defaultConsoleLayoutInfoIfEmpty(final String content) {
         String result;
 
         if (StringUtils.isBlank(content)) {
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AnyWizardBuilder.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AnyWizardBuilder.java
index 7ce5c43..922554e 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AnyWizardBuilder.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AnyWizardBuilder.java
@@ -94,8 +94,7 @@ public abstract class AnyWizardBuilder extends AbstractAnyWizardBuilder<UserTO>
         wizardModel.add(new UserDetails(
                 UserWrapper.class.cast(modelObject),
                 mode == AjaxWizard.Mode.TEMPLATE,
-                UserFormLayoutInfo.class.cast(formLayoutInfo).isPasswordManagement(),
-                pageRef));
+                UserFormLayoutInfo.class.cast(formLayoutInfo).isPasswordManagement()));
 
         if (formLayoutInfo.isAuxClasses()) {
             wizardModel.add(new EnduserAuxClasses(modelObject, anyTypeClasses));
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserDetails.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserDetails.java
index fdc6ccc..c2b7b1f 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserDetails.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserDetails.java
@@ -37,7 +37,6 @@ import org.apache.syncope.common.lib.to.RealmTO;
 import org.apache.syncope.common.lib.to.SecurityQuestionTO;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -73,8 +72,8 @@ public class UserDetails extends WizardStep {
     public UserDetails(
             final UserWrapper wrapper,
             final boolean templateMode,
-            final boolean showPasswordManagement,
-            final PageReference pageRef) {
+            final boolean showPasswordManagement) {
+
         super();
 
         userTO = wrapper.getInnerObject();
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
index 5744038..d69826d 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
@@ -29,8 +29,8 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "_class")
 @JsonPropertyOrder(value = { "_class", "key", "description" })
-@Schema(subTypes = { OIDCRPTO.class, SAML2SPTO.class }, discriminatorProperty = "_class")
-public abstract class ClientAppTO implements EntityTO {
+@Schema(subTypes = { OIDCRPTO.class, SAML2SPTO.class, CASSPTO.class }, discriminatorProperty = "_class")
+public abstract class ClientAppTO implements NamedEntityTO {
 
     private static final long serialVersionUID = 6577639976115661357L;
 
@@ -104,10 +104,12 @@ public abstract class ClientAppTO implements EntityTO {
         this.key = key;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(final String name) {
         this.name = name;
     }
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRPTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRPTO.java
index 3d4c3b1..38b27cd 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRPTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRPTO.java
@@ -19,14 +19,15 @@
 package org.apache.syncope.common.lib.to;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
 
 @Schema(allOf = { ClientAppTO.class })
@@ -44,9 +45,9 @@ public class OIDCRPTO extends ClientAppTO {
 
     private final List<String> redirectUris = new ArrayList<>();
 
-    private final Set<String> supportedGrantTypes = new HashSet<>();
+    private final List<OIDCGrantType> supportedGrantTypes = new ArrayList<>();
 
-    private final Set<String> supportedResponseTypes = new HashSet<>();
+    private final List<OIDCResponseType> supportedResponseTypes = new ArrayList<>();
 
     private String logoutUri;
 
@@ -74,15 +75,21 @@ public class OIDCRPTO extends ClientAppTO {
         this.clientSecret = clientSecret;
     }
 
+    @JacksonXmlElementWrapper(localName = "redirectUris")
+    @JacksonXmlProperty(localName = "redirectUri")
     public List<String> getRedirectUris() {
         return redirectUris;
     }
 
-    public Set<String> getSupportedGrantTypes() {
+    @JacksonXmlElementWrapper(localName = "supportedGrantTypes")
+    @JacksonXmlProperty(localName = "supportedGrantType")
+    public List<OIDCGrantType> getSupportedGrantTypes() {
         return supportedGrantTypes;
     }
 
-    public Set<String> getSupportedResponseTypes() {
+    @JacksonXmlElementWrapper(localName = "supportedResponseTypes")
+    @JacksonXmlProperty(localName = "supportedResponseType")
+    public List<OIDCResponseType> getSupportedResponseTypes() {
         return supportedResponseTypes;
     }
 
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
index 82a7987..109d0c4 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
@@ -19,11 +19,12 @@
 package org.apache.syncope.common.lib.to;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.syncope.common.lib.types.XmlSecAlgorithms;
+import org.apache.syncope.common.lib.types.XmlSecAlgorithm;
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
 
 import java.util.ArrayList;
@@ -56,21 +57,21 @@ public class SAML2SPTO extends ClientAppTO {
 
     private String nameIdQualifier;
 
-    private String assertionAudiences;
+    private final List<String> assertionAudiences = new ArrayList<>();
 
     private String serviceProviderNameIdQualifier;
 
-    private List<XmlSecAlgorithms> signingSignatureAlgorithms = new ArrayList<>();
+    private final List<XmlSecAlgorithm> signingSignatureAlgorithms = new ArrayList<>();
 
-    private List<XmlSecAlgorithms> signingSignatureReferenceDigestMethods = new ArrayList<>();
+    private final List<XmlSecAlgorithm> signingSignatureReferenceDigestMethods = new ArrayList<>();
 
-    private List<XmlSecAlgorithms> encryptionDataAlgorithms = new ArrayList<>();
+    private final List<XmlSecAlgorithm> encryptionDataAlgorithms = new ArrayList<>();
 
-    private List<XmlSecAlgorithms> encryptionKeyAlgorithms = new ArrayList<>();
-    
-    private List<XmlSecAlgorithms> signingSignatureBlackListedAlgorithms = new ArrayList<>();
+    private final List<XmlSecAlgorithm> encryptionKeyAlgorithms = new ArrayList<>();
 
-    private List<XmlSecAlgorithms> encryptionBlackListedAlgorithms = new ArrayList<>();
+    private final List<XmlSecAlgorithm> signingSignatureBlackListedAlgorithms = new ArrayList<>();
+
+    private final List<XmlSecAlgorithm> encryptionBlackListedAlgorithms = new ArrayList<>();
 
     @JacksonXmlProperty(localName = "_class", isAttribute = true)
     @JsonProperty("_class")
@@ -168,14 +169,12 @@ public class SAML2SPTO extends ClientAppTO {
         this.nameIdQualifier = nameIdQualifier;
     }
 
-    public String getAssertionAudiences() {
+    @JacksonXmlElementWrapper(localName = "assertionAudiences")
+    @JacksonXmlProperty(localName = "assertionAudience")
+    public List<String> getAssertionAudiences() {
         return assertionAudiences;
     }
 
-    public void setAssertionAudiences(final String assertionAudiences) {
-        this.assertionAudiences = assertionAudiences;
-    }
-
     public String getServiceProviderNameIdQualifier() {
         return serviceProviderNameIdQualifier;
     }
@@ -184,54 +183,42 @@ public class SAML2SPTO extends ClientAppTO {
         this.serviceProviderNameIdQualifier = serviceProviderNameIdQualifier;
     }
 
-    public List<XmlSecAlgorithms> getSigningSignatureAlgorithms() {
+    @JacksonXmlElementWrapper(localName = "signingSignatureAlgorithms")
+    @JacksonXmlProperty(localName = "signingSignatureAlgorithm")
+    public List<XmlSecAlgorithm> getSigningSignatureAlgorithms() {
         return signingSignatureAlgorithms;
     }
 
-    public List<XmlSecAlgorithms> getSigningSignatureReferenceDigestMethods() {
+    @JacksonXmlElementWrapper(localName = "signingSignatureReferenceDigestMethods")
+    @JacksonXmlProperty(localName = "signingSignatureReferenceDigestMethod")
+    public List<XmlSecAlgorithm> getSigningSignatureReferenceDigestMethods() {
         return signingSignatureReferenceDigestMethods;
     }
 
-    public List<XmlSecAlgorithms> getEncryptionDataAlgorithms() {
+    @JacksonXmlElementWrapper(localName = "encryptionDataAlgorithms")
+    @JacksonXmlProperty(localName = "encryptionDataAlgorithm")
+    public List<XmlSecAlgorithm> getEncryptionDataAlgorithms() {
         return encryptionDataAlgorithms;
     }
 
-    public List<XmlSecAlgorithms> getEncryptionKeyAlgorithms() {
+    @JacksonXmlElementWrapper(localName = "encryptionKeyAlgorithms")
+    @JacksonXmlProperty(localName = "encryptionKeyAlgorithm")
+    public List<XmlSecAlgorithm> getEncryptionKeyAlgorithms() {
         return encryptionKeyAlgorithms;
     }
 
-    public void setSigningSignatureAlgorithms(final List<XmlSecAlgorithms> signingSignatureAlgorithms) {
-        this.signingSignatureAlgorithms = signingSignatureAlgorithms;
-    }
-
-    public void setSigningSignatureReferenceDigestMethods(final List<XmlSecAlgorithms> algs) {
-        this.signingSignatureReferenceDigestMethods = algs;
-    }
-
-    public void setEncryptionDataAlgorithms(final List<XmlSecAlgorithms> encryptionDataAlgorithms) {
-        this.encryptionDataAlgorithms = encryptionDataAlgorithms;
-    }
-
-    public void setEncryptionKeyAlgorithms(final List<XmlSecAlgorithms> encryptionKeyAlgorithms) {
-        this.encryptionKeyAlgorithms = encryptionKeyAlgorithms;
-    }
-
-    public List<XmlSecAlgorithms> getSigningSignatureBlackListedAlgorithms() {
+    @JacksonXmlElementWrapper(localName = "signingSignatureBlackListedAlgorithms")
+    @JacksonXmlProperty(localName = "signingSignatureBlackListedAlgorithm")
+    public List<XmlSecAlgorithm> getSigningSignatureBlackListedAlgorithms() {
         return signingSignatureBlackListedAlgorithms;
     }
 
-    public void setSigningSignatureBlackListedAlgorithms(final List<XmlSecAlgorithms> algs) {
-        this.signingSignatureBlackListedAlgorithms = algs;
-    }
-
-    public List<XmlSecAlgorithms> getEncryptionBlackListedAlgorithms() {
+    @JacksonXmlElementWrapper(localName = "encryptionBlackListedAlgorithms")
+    @JacksonXmlProperty(localName = "encryptionBlackListedAlgorithm")
+    public List<XmlSecAlgorithm> getEncryptionBlackListedAlgorithms() {
         return encryptionBlackListedAlgorithms;
     }
 
-    public void setEncryptionBlackListedAlgorithms(final List<XmlSecAlgorithms> algs) {
-        this.encryptionBlackListedAlgorithms = algs;
-    }
-
     @Override
     public boolean equals(final Object obj) {
         if (obj == null) {
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/OIDCGrantType.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/OIDCGrantType.java
new file mode 100644
index 0000000..2304cbf
--- /dev/null
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/OIDCGrantType.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.syncope.common.lib.types;
+
+public enum OIDCGrantType {
+    authorization_code,
+    password,
+    client_credentials,
+    refresh_token;
+
+}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/OIDCResponseType.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/OIDCResponseType.java
new file mode 100644
index 0000000..dbf919b
--- /dev/null
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/OIDCResponseType.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.syncope.common.lib.types;
+
+public enum OIDCResponseType {
+    CODE("code"),
+    TOKEN("token"),
+    ID_TOKEN_TOKEN("id_token token");
+
+    private final String externalForm;
+
+    OIDCResponseType(final String external) {
+        this.externalForm = external;
+    }
+
+    public String getExternalForm() {
+        return externalForm;
+    }
+}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/XmlSecAlgorithms.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/XmlSecAlgorithm.java
similarity index 98%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/types/XmlSecAlgorithms.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/types/XmlSecAlgorithm.java
index 5fa0658..3c11852 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/XmlSecAlgorithms.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/XmlSecAlgorithm.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.common.lib.types;
 
-public enum XmlSecAlgorithms {
+public enum XmlSecAlgorithm {
 
     /**
      * Triple DES EDE (192 bit key) in CBC mode
@@ -157,7 +157,7 @@ public enum XmlSecAlgorithms {
 
     private final String algorithm;
 
-    XmlSecAlgorithms(final String uri) {
+    XmlSecAlgorithm(final String uri) {
         this.algorithm = uri;
     }
 
diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/batch/BatchItemRequest.java b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/batch/BatchItemRequest.java
index c8ce65f..9e04f28 100644
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/batch/BatchItemRequest.java
+++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/batch/BatchItemRequest.java
@@ -141,9 +141,17 @@ public class BatchItemRequest extends HttpServletRequestWrapper {
 
     @Override
     public int getContentLength() {
-        return batchItem.getHeaders().containsKey(HttpHeaders.CONTENT_LENGTH)
-                ? Integer.valueOf(batchItem.getHeaders().get(HttpHeaders.CONTENT_LENGTH).get(0).toString())
-                : 0;
+        int contentLength = 0;
+        if (batchItem.getHeaders().containsKey(HttpHeaders.CONTENT_LENGTH)) {
+            try {
+                contentLength = Integer.valueOf(
+                        batchItem.getHeaders().get(HttpHeaders.CONTENT_LENGTH).get(0).toString());
+            } catch (NumberFormatException e) {
+                LOG.error("Invalid value found for {}: {}",
+                        HttpHeaders.CONTENT_LENGTH, batchItem.getHeaders().get(HttpHeaders.CONTENT_LENGTH), e);
+            }
+        }
+        return contentLength;
     }
 
     @Override
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java
index 6ce0f82..74b105b 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java
@@ -18,8 +18,9 @@
  */
 package org.apache.syncope.core.persistence.api.entity.auth;
 
-import java.util.List;
 import java.util.Set;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
 
 public interface OIDCRP extends ClientApp {
@@ -32,11 +33,11 @@ public interface OIDCRP extends ClientApp {
 
     String getClientSecret();
 
-    List<String> getRedirectUris();
+    Set<String> getRedirectUris();
 
-    Set<String> getSupportedGrantTypes();
+    Set<OIDCGrantType> getSupportedGrantTypes();
 
-    Set<String> getSupportedResponseTypes();
+    Set<OIDCResponseType> getSupportedResponseTypes();
 
     boolean isSignIdToken();
 
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java
index b58c662..d3f2d42 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java
@@ -18,10 +18,10 @@
  */
 package org.apache.syncope.core.persistence.api.entity.auth;
 
-import org.apache.syncope.common.lib.types.XmlSecAlgorithms;
-import org.apache.syncope.common.lib.types.SAML2SPNameId;
-
 import java.util.List;
+import java.util.Set;
+import org.apache.syncope.common.lib.types.SAML2SPNameId;
+import org.apache.syncope.common.lib.types.XmlSecAlgorithm;
 
 public interface SAML2SP extends ClientApp {
 
@@ -69,35 +69,21 @@ public interface SAML2SP extends ClientApp {
 
     String getNameIdQualifier();
 
-    void setAssertionAudiences(String location);
-
-    String getAssertionAudiences();
+    Set<String> getAssertionAudiences();
 
     void setServiceProviderNameIdQualifier(String location);
 
     String getServiceProviderNameIdQualifier();
 
-    List<XmlSecAlgorithms> getSigningSignatureAlgorithms();
-
-    List<XmlSecAlgorithms> getSigningSignatureReferenceDigestMethods();
-
-    List<XmlSecAlgorithms> getEncryptionDataAlgorithms();
-
-    List<XmlSecAlgorithms> getEncryptionKeyAlgorithms();
-
-    void setSigningSignatureAlgorithms(List<XmlSecAlgorithms> algorithms);
-
-    void setSigningSignatureReferenceDigestMethods(List<XmlSecAlgorithms> methods);
-
-    void setEncryptionDataAlgorithms(List<XmlSecAlgorithms> algorithms);
+    List<XmlSecAlgorithm> getSigningSignatureAlgorithms();
 
-    void setEncryptionKeyAlgorithms(List<XmlSecAlgorithms> algorithms);
+    List<XmlSecAlgorithm> getSigningSignatureReferenceDigestMethods();
 
-    List<XmlSecAlgorithms> getSigningSignatureBlackListedAlgorithms();
+    List<XmlSecAlgorithm> getEncryptionDataAlgorithms();
 
-    List<XmlSecAlgorithms> getEncryptionBlackListedAlgorithms();
+    List<XmlSecAlgorithm> getEncryptionKeyAlgorithms();
 
-    void setSigningSignatureBlackListedAlgorithms(List<XmlSecAlgorithms> algorithms);
+    List<XmlSecAlgorithm> getSigningSignatureBlackListedAlgorithms();
 
-    void setEncryptionBlackListedAlgorithms(List<XmlSecAlgorithms> algorithms);
+    List<XmlSecAlgorithm> getEncryptionBlackListedAlgorithms();
 }
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java
index dee84f4..fdc4f98 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java
@@ -25,12 +25,12 @@ import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.Table;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
 import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 
@@ -53,30 +53,32 @@ public class JPAOIDCRP extends AbstractClientApp implements OIDCRP {
     private OIDCSubjectType subjectType;
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "redirectUri")
     @CollectionTable(name = "OIDCRP_RedirectUris",
             joinColumns =
             @JoinColumn(name = "client_id", referencedColumnName = "id"))
-    private List<String> redirectUris = new ArrayList<>();
+    private Set<String> redirectUris = new HashSet<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Enumerated(EnumType.STRING)
+    @Column(name = "supportedGrantType")
     @CollectionTable(name = "OIDCRP_SupportedGrantTypes",
             joinColumns =
             @JoinColumn(name = "client_id", referencedColumnName = "id"))
-    private Set<String> supportedGrantTypes = new HashSet<>();
+    private Set<OIDCGrantType> supportedGrantTypes = new HashSet<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
+    @Enumerated(EnumType.STRING)
     @Column(name = "supportedResponseType")
     @CollectionTable(name = "OIDCRP_SupportedResponseTypes",
             joinColumns =
             @JoinColumn(name = "client_id", referencedColumnName = "id"))
-    private Set<String> supportedResponseTypes = new HashSet<>();
+    private Set<OIDCResponseType> supportedResponseTypes = new HashSet<>();
 
     private String logoutUri;
 
     @Override
-    public List<String> getRedirectUris() {
+    public Set<String> getRedirectUris() {
         return redirectUris;
     }
 
@@ -121,12 +123,12 @@ public class JPAOIDCRP extends AbstractClientApp implements OIDCRP {
     }
 
     @Override
-    public Set<String> getSupportedGrantTypes() {
+    public Set<OIDCGrantType> getSupportedGrantTypes() {
         return supportedGrantTypes;
     }
 
     @Override
-    public Set<String> getSupportedResponseTypes() {
+    public Set<OIDCResponseType> getSupportedResponseTypes() {
         return supportedResponseTypes;
     }
 
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java
index 8e94d11..8b02ab6 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java
@@ -18,6 +18,10 @@
  */
 package org.apache.syncope.core.persistence.jpa.entity.auth;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
@@ -27,10 +31,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.Table;
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
 import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
-import org.apache.syncope.common.lib.types.XmlSecAlgorithms;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.syncope.common.lib.types.XmlSecAlgorithm;
 
 @Entity
 @Table(name = JPASAML2SP.TABLE)
@@ -65,52 +66,57 @@ public class JPASAML2SP extends AbstractClientApp implements SAML2SP {
 
     private String nameIdQualifier;
 
-    private String assertionAudiences;
+    @ElementCollection(fetch = FetchType.EAGER)
+    @Column(name = "assertionAudience")
+    @CollectionTable(name = "SAML2SP_AssertionAudiences",
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private Set<String> assertionAudiences = new HashSet<>();
 
     @Column(name = "spNameIdQualifier")
     private String serviceProviderNameIdQualifier;
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "signingSignatureAlgorithm")
     @CollectionTable(name = "SAML2SP_SigningSignatureAlgs",
-        joinColumns =
-        @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
-    private List<XmlSecAlgorithms> signingSignatureAlgorithms = new ArrayList<>();
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private List<XmlSecAlgorithm> signingSignatureAlgorithms = new ArrayList<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "signingSignatureReferenceDigestMethod")
     @CollectionTable(name = "SAML2SP_SigningSignatureRefDigestAlgs",
-        joinColumns =
-        @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
-    private List<XmlSecAlgorithms> signingSignatureReferenceDigestMethods = new ArrayList<>();
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private List<XmlSecAlgorithm> signingSignatureReferenceDigestMethods = new ArrayList<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "encryptionDataAlgorithm")
     @CollectionTable(name = "SAML2SP_EncryptionDataAlgs",
-        joinColumns =
-        @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
-    private List<XmlSecAlgorithms> encryptionDataAlgorithms = new ArrayList<>();
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private List<XmlSecAlgorithm> encryptionDataAlgorithms = new ArrayList<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "encryptionKeyAlgorithm")
     @CollectionTable(name = "SAML2SP_EncryptionKeyAlgs",
-        joinColumns =
-        @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
-    private List<XmlSecAlgorithms> encryptionKeyAlgorithms = new ArrayList<>();
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private List<XmlSecAlgorithm> encryptionKeyAlgorithms = new ArrayList<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "signingSignatureBlackListedAlgorithm")
     @CollectionTable(name = "SAML2SP_BlacklistedSigningAlgs",
-        joinColumns =
-        @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
-    private List<XmlSecAlgorithms> signingSignatureBlackListedAlgorithms = new ArrayList<>();
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private List<XmlSecAlgorithm> signingSignatureBlackListedAlgorithms = new ArrayList<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @Column
+    @Column(name = "encryptionBlackListedAlgorithm")
     @CollectionTable(name = "SAML2SP_BlacklistedEncryptionAlgs",
-        joinColumns =
-        @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
-    private List<XmlSecAlgorithms> encryptionBlackListedAlgorithms = new ArrayList<>();
+            joinColumns =
+            @JoinColumn(name = "client_app_id", referencedColumnName = "id"))
+    private List<XmlSecAlgorithm> encryptionBlackListedAlgorithms = new ArrayList<>();
 
     @Override
     public String getEntityId() {
@@ -223,16 +229,11 @@ public class JPASAML2SP extends AbstractClientApp implements SAML2SP {
     }
 
     @Override
-    public String getAssertionAudiences() {
+    public Set<String> getAssertionAudiences() {
         return assertionAudiences;
     }
 
     @Override
-    public void setAssertionAudiences(final String assertionAudiences) {
-        this.assertionAudiences = assertionAudiences;
-    }
-
-    @Override
     public String getServiceProviderNameIdQualifier() {
         return serviceProviderNameIdQualifier;
     }
@@ -243,62 +244,32 @@ public class JPASAML2SP extends AbstractClientApp implements SAML2SP {
     }
 
     @Override
-    public List<XmlSecAlgorithms> getSigningSignatureAlgorithms() {
+    public List<XmlSecAlgorithm> getSigningSignatureAlgorithms() {
         return signingSignatureAlgorithms;
     }
 
     @Override
-    public void setSigningSignatureAlgorithms(final List<XmlSecAlgorithms> signingSignatureAlgorithms) {
-        this.signingSignatureAlgorithms = signingSignatureAlgorithms;
-    }
-
-    @Override
-    public List<XmlSecAlgorithms> getSigningSignatureReferenceDigestMethods() {
+    public List<XmlSecAlgorithm> getSigningSignatureReferenceDigestMethods() {
         return signingSignatureReferenceDigestMethods;
     }
 
     @Override
-    public void setSigningSignatureReferenceDigestMethods(final List<XmlSecAlgorithms> algorithms) {
-        this.signingSignatureReferenceDigestMethods = algorithms;
-    }
-
-    @Override
-    public List<XmlSecAlgorithms> getEncryptionDataAlgorithms() {
+    public List<XmlSecAlgorithm> getEncryptionDataAlgorithms() {
         return encryptionDataAlgorithms;
     }
 
     @Override
-    public void setEncryptionDataAlgorithms(final List<XmlSecAlgorithms> algorithms) {
-        this.encryptionDataAlgorithms = algorithms;
-    }
-
-    @Override
-    public List<XmlSecAlgorithms> getEncryptionKeyAlgorithms() {
+    public List<XmlSecAlgorithm> getEncryptionKeyAlgorithms() {
         return encryptionKeyAlgorithms;
     }
 
     @Override
-    public void setEncryptionKeyAlgorithms(final List<XmlSecAlgorithms> algorithms) {
-        this.encryptionKeyAlgorithms = algorithms;
-    }
-
-    @Override
-    public List<XmlSecAlgorithms> getSigningSignatureBlackListedAlgorithms() {
+    public List<XmlSecAlgorithm> getSigningSignatureBlackListedAlgorithms() {
         return signingSignatureBlackListedAlgorithms;
     }
 
     @Override
-    public void setSigningSignatureBlackListedAlgorithms(final List<XmlSecAlgorithms> algorithms) {
-        this.signingSignatureBlackListedAlgorithms = algorithms;
-    }
-
-    @Override
-    public List<XmlSecAlgorithms> getEncryptionBlackListedAlgorithms() {
+    public List<XmlSecAlgorithm> getEncryptionBlackListedAlgorithms() {
         return encryptionBlackListedAlgorithms;
     }
-
-    @Override
-    public void setEncryptionBlackListedAlgorithms(final List<XmlSecAlgorithms> algorithms) {
-        this.encryptionBlackListedAlgorithms = algorithms;
-    }
 }
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
index d79677a..bd0c77f 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
@@ -23,6 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.UUID;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
 import org.apache.syncope.core.persistence.api.dao.auth.OIDCRPDAO;
 import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
@@ -49,8 +51,8 @@ public class OIDCRPTest extends AbstractClientAppTest {
         rp.setClientId("clientid");
         rp.setClientSecret("secret");
         rp.setSubjectType(OIDCSubjectType.PUBLIC);
-        rp.getSupportedGrantTypes().add("something");
-        rp.getSupportedResponseTypes().add("something");
+        rp.getSupportedGrantTypes().add(OIDCGrantType.password);
+        rp.getSupportedResponseTypes().add(OIDCResponseType.CODE);
 
         AccessPolicy accessPolicy = buildAndSaveAccessPolicy();
         rp.setAccessPolicy(accessPolicy);
@@ -72,7 +74,7 @@ public class OIDCRPTest extends AbstractClientAppTest {
 
         rp = oidcrpDAO.findByName("OIDC");
         assertNotNull(rp);
-        
+
         rp = oidcrpDAO.findByClientAppId(rp.getClientAppId());
         assertNotNull(rp);
 
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
index c6c3c25..e19798e 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
@@ -18,7 +18,13 @@
  */
 package org.apache.syncope.core.persistence.jpa.inner;
 
-import org.apache.syncope.common.lib.types.XmlSecAlgorithms;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.UUID;
+import org.apache.syncope.common.lib.types.XmlSecAlgorithm;
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
 import org.apache.syncope.core.persistence.api.dao.auth.SAML2SPDAO;
 import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
@@ -28,14 +34,6 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 @Transactional("Master")
 public class SAML2SPTest extends AbstractClientAppTest {
 
@@ -54,10 +52,11 @@ public class SAML2SPTest extends AbstractClientAppTest {
         sp.setRequiredNameIdFormat(SAML2SPNameId.EMAIL_ADDRESS);
         sp.setEncryptionOptional(true);
         sp.setEncryptAssertions(true);
-        sp.setEncryptionDataAlgorithms(List.of(XmlSecAlgorithms.AES_128_GCM));
-        sp.setEncryptionKeyAlgorithms(List.of(XmlSecAlgorithms.RSA_OAEP_11));
-        sp.setSigningSignatureReferenceDigestMethods(List.of(XmlSecAlgorithms.SHA1));
-        sp.setSigningSignatureAlgorithms(List.of(XmlSecAlgorithms.SHA256, XmlSecAlgorithms.SHA512));
+        sp.getEncryptionDataAlgorithms().add(XmlSecAlgorithm.AES_128_GCM);
+        sp.getEncryptionKeyAlgorithms().add(XmlSecAlgorithm.RSA_OAEP_11);
+        sp.getSigningSignatureReferenceDigestMethods().add(XmlSecAlgorithm.SHA1);
+        sp.getSigningSignatureAlgorithms().add(XmlSecAlgorithm.SHA256);
+        sp.getSigningSignatureAlgorithms().add(XmlSecAlgorithm.SHA512);
 
         AccessPolicy accessPolicy = buildAndSaveAccessPolicy();
         sp.setAccessPolicy(accessPolicy);
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
index 061f076..4b62c0e 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
@@ -79,10 +79,10 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
     public <T extends ClientAppTO> T getClientAppTO(final ClientApp clientApp) {
         if (clientApp instanceof SAML2SP) {
             return (T) getSAMLClientAppTO((SAML2SP) clientApp);
-        } 
+        }
         if (clientApp instanceof OIDCRP) {
             return (T) getOIDCClientAppTO((OIDCRP) clientApp);
-        } 
+        }
         if (clientApp instanceof CASSP) {
             return (T) getCASClientAppTO((CASSP) clientApp);
         }
@@ -115,16 +115,29 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
         clientApp.setRequiredNameIdFormat(clientAppTO.getRequiredNameIdFormat());
         clientApp.setSkewAllowance(clientAppTO.getSkewAllowance());
         clientApp.setNameIdQualifier(clientAppTO.getNameIdQualifier());
-        clientApp.setAssertionAudiences(clientAppTO.getAssertionAudiences());
+        clientApp.getAssertionAudiences().clear();
+        clientApp.getAssertionAudiences().addAll(clientAppTO.getAssertionAudiences());
         clientApp.setServiceProviderNameIdQualifier(clientAppTO.getServiceProviderNameIdQualifier());
 
-        clientApp.setSigningSignatureAlgorithms(clientAppTO.getSigningSignatureAlgorithms());
-        clientApp.setSigningSignatureReferenceDigestMethods(clientAppTO.getSigningSignatureReferenceDigestMethods());
-        clientApp.setEncryptionKeyAlgorithms(clientAppTO.getEncryptionKeyAlgorithms());
-        clientApp.setEncryptionDataAlgorithms(clientAppTO.getEncryptionDataAlgorithms());
-
-        clientApp.setSigningSignatureBlackListedAlgorithms(clientAppTO.getSigningSignatureBlackListedAlgorithms());
-        clientApp.setEncryptionBlackListedAlgorithms(clientAppTO.getEncryptionBlackListedAlgorithms());
+        clientApp.getSigningSignatureAlgorithms().clear();
+        clientApp.getSigningSignatureAlgorithms().addAll(
+                clientAppTO.getSigningSignatureAlgorithms());
+        clientApp.getSigningSignatureReferenceDigestMethods().clear();
+        clientApp.getSigningSignatureReferenceDigestMethods().addAll(
+                clientAppTO.getSigningSignatureReferenceDigestMethods());
+        clientApp.getEncryptionKeyAlgorithms().clear();
+        clientApp.getEncryptionKeyAlgorithms().addAll(
+                clientAppTO.getEncryptionKeyAlgorithms());
+        clientApp.getEncryptionDataAlgorithms().clear();
+        clientApp.getEncryptionDataAlgorithms().addAll(
+                clientAppTO.getEncryptionDataAlgorithms());
+
+        clientApp.getSigningSignatureBlackListedAlgorithms().clear();
+        clientApp.getSigningSignatureBlackListedAlgorithms().
+                addAll(clientAppTO.getSigningSignatureBlackListedAlgorithms());
+        clientApp.getEncryptionBlackListedAlgorithms().clear();
+        clientApp.getEncryptionBlackListedAlgorithms().addAll(
+                clientAppTO.getEncryptionBlackListedAlgorithms());
     }
 
     private static SAML2SPTO getSAMLClientAppTO(final SAML2SP clientApp) {
@@ -142,16 +155,22 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
         clientAppTO.setRequiredNameIdFormat(clientApp.getRequiredNameIdFormat());
         clientAppTO.setSkewAllowance(clientApp.getSkewAllowance());
         clientAppTO.setNameIdQualifier(clientApp.getNameIdQualifier());
-        clientAppTO.setAssertionAudiences(clientApp.getAssertionAudiences());
+        clientAppTO.getAssertionAudiences().addAll(clientApp.getAssertionAudiences());
         clientAppTO.setServiceProviderNameIdQualifier(clientApp.getServiceProviderNameIdQualifier());
 
-        clientAppTO.setSigningSignatureAlgorithms(clientApp.getSigningSignatureAlgorithms());
-        clientAppTO.setSigningSignatureReferenceDigestMethods(clientApp.getSigningSignatureReferenceDigestMethods());
-        clientAppTO.setEncryptionKeyAlgorithms(clientApp.getEncryptionKeyAlgorithms());
-        clientAppTO.setEncryptionDataAlgorithms(clientApp.getEncryptionDataAlgorithms());
+        clientAppTO.getSigningSignatureAlgorithms().addAll(
+                clientApp.getSigningSignatureAlgorithms());
+        clientAppTO.getSigningSignatureReferenceDigestMethods().addAll(
+                clientApp.getSigningSignatureReferenceDigestMethods());
+        clientAppTO.getEncryptionKeyAlgorithms().addAll(
+                clientApp.getEncryptionKeyAlgorithms());
+        clientAppTO.getEncryptionDataAlgorithms().addAll(
+                clientApp.getEncryptionDataAlgorithms());
 
-        clientAppTO.setSigningSignatureBlackListedAlgorithms(clientApp.getSigningSignatureBlackListedAlgorithms());
-        clientAppTO.setEncryptionBlackListedAlgorithms(clientApp.getEncryptionBlackListedAlgorithms());
+        clientAppTO.getSigningSignatureBlackListedAlgorithms().addAll(
+                clientApp.getSigningSignatureBlackListedAlgorithms());
+        clientAppTO.getEncryptionBlackListedAlgorithms().addAll(
+                clientApp.getEncryptionBlackListedAlgorithms());
 
         return clientAppTO;
     }
@@ -169,8 +188,11 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
         clientApp.setClientId(clientAppTO.getClientId());
         clientApp.setSignIdToken(clientAppTO.isSignIdToken());
         clientApp.setSubjectType(clientAppTO.getSubjectType());
+        clientApp.getRedirectUris().clear();
         clientApp.getRedirectUris().addAll(clientAppTO.getRedirectUris());
+        clientApp.getSupportedGrantTypes().clear();
         clientApp.getSupportedGrantTypes().addAll(clientAppTO.getSupportedGrantTypes());
+        clientApp.getSupportedResponseTypes().clear();
         clientApp.getSupportedResponseTypes().addAll(clientAppTO.getSupportedResponseTypes());
 
         clientApp.setLogoutUri(clientAppTO.getLogoutUri());
@@ -213,11 +235,11 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
         clientAppTO.setTheme(clientApp.getTheme());
 
         clientAppTO.setAuthPolicy(clientApp.getAuthPolicy() == null
-            ? null : clientApp.getAuthPolicy().getKey());
+                ? null : clientApp.getAuthPolicy().getKey());
         clientAppTO.setAccessPolicy(clientApp.getAccessPolicy() == null
-            ? null : clientApp.getAccessPolicy().getKey());
+                ? null : clientApp.getAccessPolicy().getKey());
         clientAppTO.setAttrReleasePolicy(clientApp.getAttrReleasePolicy() == null
-            ? null : clientApp.getAttrReleasePolicy().getKey());
+                ? null : clientApp.getAttrReleasePolicy().getKey());
     }
 
     private void doUpdateCommon(final ClientApp clientApp, final ClientAppTO clientAppTO) {
@@ -235,7 +257,7 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
             } else {
                 SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
                 sce.getElements().add("Expected " + AuthPolicy.class.getSimpleName()
-                    + ", found " + policy.getClass().getSimpleName());
+                        + ", found " + policy.getClass().getSimpleName());
                 throw sce;
             }
         }
@@ -249,7 +271,7 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
             } else {
                 SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
                 sce.getElements().add("Expected " + AccessPolicy.class.getSimpleName()
-                    + ", found " + policy.getClass().getSimpleName());
+                        + ", found " + policy.getClass().getSimpleName());
                 throw sce;
             }
         }
@@ -263,7 +285,7 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
             } else {
                 SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
                 sce.getElements().add("Expected " + AttrReleasePolicy.class.getSimpleName()
-                    + ", found " + policy.getClass().getSimpleName());
+                        + ", found " + policy.getClass().getSimpleName());
                 throw sce;
             }
         }
diff --git a/ext/flowable/client-common-ui/src/main/java/org/apache/syncope/ext/client/common/ui/panels/UserRequestFormPanel.java b/ext/flowable/client-common-ui/src/main/java/org/apache/syncope/ext/client/common/ui/panels/UserRequestFormPanel.java
index ceda43f..fae7b83 100644
--- a/ext/flowable/client-common-ui/src/main/java/org/apache/syncope/ext/client/common/ui/panels/UserRequestFormPanel.java
+++ b/ext/flowable/client-common-ui/src/main/java/org/apache/syncope/ext/client/common/ui/panels/UserRequestFormPanel.java
@@ -36,7 +36,6 @@ import org.apache.syncope.common.lib.to.UserRequestFormProperty;
 import org.apache.syncope.common.lib.to.UserRequestForm;
 import org.apache.syncope.common.lib.to.UserRequestFormPropertyValue;
 import org.apache.syncope.common.lib.types.IdRepoEntitlement;
-import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
@@ -55,12 +54,11 @@ public abstract class UserRequestFormPanel extends Panel {
 
     protected static final Logger LOG = LoggerFactory.getLogger(UserRequestFormPanel.class);
 
-    public UserRequestFormPanel(final String id, final PageReference pageRef, final UserRequestForm form) {
-        this(id, pageRef, form, true);
+    public UserRequestFormPanel(final String id, final UserRequestForm form) {
+        this(id, form, true);
     }
 
-    public UserRequestFormPanel(final String id, final PageReference pageRef, final UserRequestForm form,
-            final boolean showDetails) {
+    public UserRequestFormPanel(final String id, final UserRequestForm form, final boolean showDetails) {
         super(id);
 
         IModel<List<UserRequestFormProperty>> formProps = new LoadableDetachableModel<List<UserRequestFormProperty>>() {
diff --git a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
index 4c71522..e64a6e4 100644
--- a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
+++ b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
@@ -20,9 +20,9 @@ package org.apache.syncope.client.console.panels;
 
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.ui.commons.Constants;
-import org.apache.syncope.client.console.pages.BasePage;
 import org.apache.syncope.client.console.rest.UserRequestRestClient;
 import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
 import org.apache.syncope.client.ui.commons.panels.SubmitableModalPanel;
 import org.apache.syncope.client.ui.commons.panels.WizardModalPanel;
 import org.apache.syncope.common.lib.to.UserRequestForm;
@@ -48,7 +48,7 @@ public class UserRequestFormModal extends Panel implements SubmitableModalPanel,
         this.pageRef = pageRef;
 
         MultilevelPanel mlp = new MultilevelPanel("userRequestForm");
-        mlp.setFirstLevel(new UserRequestFormPanel(MultilevelPanel.FIRST_LEVEL_ID, pageRef, formTO) {
+        mlp.setFirstLevel(new UserRequestFormPanel(MultilevelPanel.FIRST_LEVEL_ID, formTO) {
 
             private static final long serialVersionUID = -2195387360323687302L;
 
@@ -70,7 +70,7 @@ public class UserRequestFormModal extends Panel implements SubmitableModalPanel,
 
     @Override
     public void onError(final AjaxRequestTarget target) {
-        ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
+        ((BaseWebPage) pageRef.getPage()).getNotificationPanel().refresh(target);
     }
 
     @Override
diff --git a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
index 9e30828..f7c3594 100644
--- a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
+++ b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
@@ -174,41 +174,38 @@ public class Flowable extends BaseExtPage {
                             .add(new Label("executionId", userRequest.getExecutionId()))
                             .add(new Label("startTime", userRequest.getStartTime()))
                     : new Fragment("fragContainer", "formProperties", UserRequestDetails.this)
-                            .add(new Form<>("userRequestWrapForm")
-                                    .add(new UserRequestFormPanel(
-                                            "userRequestFormPanel",
-                                            getPageReference(),
-                                            formTO,
-                                            false) {
-
-                                        private static final long serialVersionUID = 3617895525072546591L;
-
-                                        @Override
-                                        protected void viewDetails(final AjaxRequestTarget target) {
-                                            // do nothing
-                                        }
-                                    })
-                                    .add(new AjaxButton("submit") {
-
-                                        private static final long serialVersionUID = 4284361595033427185L;
-
-                                        @Override
-                                        protected void onSubmit(final AjaxRequestTarget target) {
-                                            try {
-                                                UserRequestRestClient.claimForm(formTO.getTaskId());
-                                                UserRequestRestClient.submitForm(formTO);
-                                                target.add(container);
-                                            } catch (SyncopeClientException sce) {
-                                                LOG.error("Unable to submit user request form for BPMN process [{}]",
-                                                        formTO.getBpmnProcess(), sce);
-                                                SyncopeEnduserSession.get().error(StringUtils.isBlank(sce.getMessage())
-                                                        ? sce.getClass().getName()
-                                                        : sce.getMessage());
-                                                notificationPanel.refresh(target);
-                                            }
-                                        }
-
-                                    }.setOutputMarkupId(true))));
+                            .add(new Form<>("userRequestWrapForm").add(new UserRequestFormPanel(
+                                    "userRequestFormPanel",
+                                    formTO,
+                                    false) {
+
+                                private static final long serialVersionUID = 3617895525072546591L;
+
+                                @Override
+                                protected void viewDetails(final AjaxRequestTarget target) {
+                                    // do nothing
+                                }
+                            }).add(new AjaxButton("submit") {
+
+                                private static final long serialVersionUID = 4284361595033427185L;
+
+                                @Override
+                                protected void onSubmit(final AjaxRequestTarget target) {
+                                    try {
+                                        UserRequestRestClient.claimForm(formTO.getTaskId());
+                                        UserRequestRestClient.submitForm(formTO);
+                                        target.add(container);
+                                    } catch (SyncopeClientException sce) {
+                                        LOG.error("Unable to submit user request form for BPMN process [{}]",
+                                                formTO.getBpmnProcess(), sce);
+                                        SyncopeEnduserSession.get().error(StringUtils.isBlank(sce.getMessage())
+                                                ? sce.getClass().getName()
+                                                : sce.getMessage());
+                                        notificationPanel.refresh(target);
+                                    }
+                                }
+
+                            }.setOutputMarkupId(true))));
 
             add(new AjaxLink<Void>("delete") {
 
@@ -256,5 +253,4 @@ public class Flowable extends BaseExtPage {
             return Model.of(ur);
         }
     }
-
 }
diff --git a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java
index 39cdc5c..1124ea3 100644
--- a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java
+++ b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java
@@ -46,7 +46,7 @@ public abstract class AbstractSAML2SP4UIResource extends AbstractResource {
         return StringUtils.substringBefore(request.getRequestURL().toString(), SAML2SP4UIConstants.URL_CONTEXT);
     }
 
-    protected ResourceResponse send(final Attributes attributes, final SAML2Request request) {
+    protected ResourceResponse send(final SAML2Request request) {
         Session.get().setAttribute(SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID, request.getIdpEntityID());
 
         ResourceResponse response = new ResourceResponse();
diff --git a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LoginResource.java b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LoginResource.java
index 4c7d8b7..0bd1b6f 100644
--- a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LoginResource.java
+++ b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LoginResource.java
@@ -21,7 +21,6 @@ package org.apache.syncope.client.ui.commons.resources.saml2sp4ui;
 import org.apache.syncope.client.ui.commons.BaseSession;
 import org.apache.syncope.client.ui.commons.SAML2SP4UIConstants;
 import org.apache.syncope.client.ui.commons.annotations.Resource;
-import org.apache.syncope.common.lib.saml2.SAML2Request;
 import org.apache.syncope.common.rest.api.service.SAML2SP4UIService;
 import org.apache.wicket.Session;
 
@@ -38,8 +37,6 @@ public class LoginResource extends AbstractSAML2SP4UIResource {
                 getParameterValue(SAML2SP4UIConstants.PARAM_IDP).toString();
 
         SAML2SP4UIService service = BaseSession.class.cast(Session.get()).getAnonymousService(SAML2SP4UIService.class);
-        SAML2Request loginRequest =
-                service.createLoginRequest(spEntityID(attributes), SAML2SP4UIConstants.URL_CONTEXT, idp);
-        return send(attributes, loginRequest);
+        return send(service.createLoginRequest(spEntityID(attributes), SAML2SP4UIConstants.URL_CONTEXT, idp));
     }
 }
diff --git a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LogoutResource.java b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LogoutResource.java
index 91b7136..21680e5 100644
--- a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LogoutResource.java
+++ b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/LogoutResource.java
@@ -70,7 +70,7 @@ public abstract class LogoutResource extends AbstractSAML2SP4UIResource {
 
                     Session.get().invalidate();
 
-                    return send(attributes, logoutRequest);
+                    return send(logoutRequest);
                 } else {
                     // process REDIRECT binding logout response
                     return doLogout(buildResponse(attributes, samlResponse, relayState));
diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SP4UILoader.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SP4UILoader.java
index f394056..4f0c2ee 100644
--- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SP4UILoader.java
+++ b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SP4UILoader.java
@@ -32,6 +32,8 @@ import org.apache.syncope.core.logic.saml2.NoOpLogoutHandler;
 import org.apache.syncope.core.persistence.api.SyncopeCoreLoader;
 import org.pac4j.saml.config.SAML2Configuration;
 import org.pac4j.saml.metadata.keystore.BaseSAML2KeystoreGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileUrlResource;
 import org.springframework.core.io.support.ResourcePatternResolver;
@@ -40,6 +42,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class SAML2SP4UILoader implements SyncopeCoreLoader {
 
+    private static final Logger LOG = LoggerFactory.getLogger(SAML2SP4UILoader.class);
+
     private static final String SAML2SP4UI_LOGIC_PROPERTIES = "saml2sp4ui-logic.properties";
 
     @Autowired
@@ -91,7 +95,11 @@ public class SAML2SP4UILoader implements SyncopeCoreLoader {
         cfg.setAuthnRequestSigned(true);
         cfg.setSpLogoutRequestSigned(true);
 
-        cfg.setAcceptedSkew(Integer.valueOf(props.getProperty("saml2.sp4ui.skew")));
+        try {
+            cfg.setAcceptedSkew(Integer.valueOf(props.getProperty("saml2.sp4ui.skew")));
+        } catch (NumberFormatException e) {
+            LOG.error("Invalid value provided for 'saml2.sp4ui.skew': {}", props.getProperty("saml2.sp4ui.skew"), e);
+        }
 
         cfg.setLogoutHandler(new NoOpLogoutHandler());
 
diff --git a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
index bcc2afd..7bd0e5b 100644
--- a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
+++ b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
@@ -55,7 +55,6 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
                     public void setObject(final Date object) {
                         scimGeneralConf.setCreationDate(object);
                     }
-
                 }, FastDateFormat.getInstance(SyncopeConstants.DEFAULT_DATE_PATTERN));
         creationDatePanel.setEnabled(false);
 
@@ -73,7 +72,6 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
                     public void setObject(final Date object) {
                         scimGeneralConf.setLastChangeDate(object);
                     }
-
                 }, FastDateFormat.getInstance(SyncopeConstants.DEFAULT_DATE_PATTERN));
         lastChangeDatePanel.setEnabled(false);
 
@@ -90,9 +88,12 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
 
                     @Override
                     public void setObject(final String object) {
-                        scimGeneralConf.setBulkMaxOperations(Integer.parseInt(object));
+                        try {
+                            scimGeneralConf.setBulkMaxOperations(Integer.parseInt(object));
+                        } catch (NumberFormatException e) {
+                            LOG.error("Invalid value provided for 'bulkMaxOperations': {}", object, e);
+                        }
                     }
-
                 });
         bulkMaxOperationsPanel.setChoices(plainSchemaNames);
 
@@ -109,9 +110,12 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
 
                     @Override
                     public void setObject(final String object) {
-                        scimGeneralConf.setBulkMaxPayloadSize(Integer.parseInt(object));
+                        try {
+                            scimGeneralConf.setBulkMaxPayloadSize(Integer.parseInt(object));
+                        } catch (NumberFormatException e) {
+                            LOG.error("Invalid value provided for 'bulkMaxPayloadSize': {}", object, e);
+                        }
                     }
-
                 });
         bulkMaxMaxPayloadSizePanel.setChoices(plainSchemaNames);
 
@@ -137,23 +141,21 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
                 });
         filterMaxResultsPanel.setChoices(plainSchemaNames);
 
-        AjaxTextFieldPanel eTagValuePanel =
-                new AjaxTextFieldPanel("eTagValue", "eTagValue",
-                        new PropertyModel<String>("eTagValue", "eTagValue") {
+        AjaxTextFieldPanel eTagValuePanel = new AjaxTextFieldPanel("eTagValue", "eTagValue",
+                new PropertyModel<String>("eTagValue", "eTagValue") {
 
-                    private static final long serialVersionUID = -6427731218492117883L;
+            private static final long serialVersionUID = -6427731218492117883L;
 
-                    @Override
-                    public String getObject() {
-                        return scimGeneralConf.getETagValue();
-                    }
-
-                    @Override
-                    public void setObject(final String object) {
-
-                    }
+            @Override
+            public String getObject() {
+                return scimGeneralConf.getETagValue();
+            }
 
-                });
+            @Override
+            public void setObject(final String object) {
+                // nothing to do
+            }
+        });
         eTagValuePanel.setEnabled(false);
 
         add(creationDatePanel);
@@ -163,5 +165,4 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
         add(filterMaxResultsPanel);
         add(eTagValuePanel);
     }
-
 }
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 8100299..0bb3085 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -91,6 +91,8 @@ import org.apache.syncope.common.lib.to.OIDCRPTO;
 import org.apache.syncope.common.lib.to.SAML2SPTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.ClientAppType;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
 import org.apache.syncope.common.lib.types.PatchOperation;
 import org.apache.syncope.common.lib.types.PolicyType;
@@ -785,8 +787,8 @@ public abstract class AbstractITCase {
         oidcrpTO.setClientId("clientId_" + getUUIDString());
         oidcrpTO.setClientSecret("secret");
         oidcrpTO.setSubjectType(OIDCSubjectType.PUBLIC);
-        oidcrpTO.getSupportedGrantTypes().add("something");
-        oidcrpTO.getSupportedResponseTypes().add("something");
+        oidcrpTO.getSupportedGrantTypes().add(OIDCGrantType.authorization_code);
+        oidcrpTO.getSupportedResponseTypes().add(OIDCResponseType.CODE);
 
         oidcrpTO.setAuthPolicy(authPolicyTO.getKey());
         oidcrpTO.setAccessPolicy(accessPolicyTO.getKey());
@@ -852,12 +854,12 @@ public abstract class AbstractITCase {
 
         AllowedAttrReleasePolicyConf conf = new AllowedAttrReleasePolicyConf();
         conf.getAllowedAttrs().addAll(List.of("cn", "givenName"));
-        
+
         AllowedAttrReleasePolicyConf.ConsentPolicy consentPolicy = conf.new ConsentPolicy();
         consentPolicy.setStatus(Boolean.TRUE);
         consentPolicy.getIncludeOnlyAttrs().addAll(Set.of("cn"));
         conf.setConsentPolicy(consentPolicy);
-        
+
         policy.setConf(conf);
 
         return policy;
diff --git a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ReportTemplateManagerService.java b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ReportTemplateManagerService.java
index ed2a19b..c670e0b 100644
--- a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ReportTemplateManagerService.java
+++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ReportTemplateManagerService.java
@@ -61,8 +61,7 @@ public class ReportTemplateManagerService {
         service.setFormat(key, format, templateIn);
     }
 
-    public static boolean removeFormat(final String key, final ReportTemplateFormat format) {
-        return false;
+    public void removeFormat(final String key, final ReportTemplateFormat format) {
+        service.removeFormat(key, format);
     }
-
 }
diff --git a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
index faff3d3..75624af 100644
--- a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
+++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
@@ -292,8 +292,8 @@ public final class ResourceExplorerTopComponent extends TopComponent {
     }
 
     static void readProperties(final java.util.Properties p) {
-        String version = p.getProperty("version");
         // TODO read your settings according to their version
+        // String version = p.getProperty("version");
     }
 
     private void addMailTemplates() {
diff --git a/sra/src/main/java/org/apache/syncope/sra/security/saml2/SAML2MetadataEndpoint.java b/sra/src/main/java/org/apache/syncope/sra/security/saml2/SAML2MetadataEndpoint.java
index 6c8efa6..5a9b6a2 100644
--- a/sra/src/main/java/org/apache/syncope/sra/security/saml2/SAML2MetadataEndpoint.java
+++ b/sra/src/main/java/org/apache/syncope/sra/security/saml2/SAML2MetadataEndpoint.java
@@ -28,7 +28,6 @@ import org.pac4j.saml.exceptions.SAMLException;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -63,7 +62,7 @@ public class SAML2MetadataEndpoint {
 
     @GetMapping(produces = { MediaType.APPLICATION_XML_VALUE })
     @ResponseBody
-    public Mono<ResponseEntity<String>> metadata(final ServerHttpRequest request) {
+    public Mono<ResponseEntity<String>> metadata() {
         return Mono.just(ResponseEntity.ok().
                 header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE).
                 body(metadata));
diff --git a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/OIDCRPTOMapper.java b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/OIDCRPTOMapper.java
index e78b169..afd9684 100644
--- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/OIDCRPTOMapper.java
+++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/OIDCRPTOMapper.java
@@ -25,6 +25,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.syncope.common.lib.to.OIDCRPTO;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.wa.WAClientApp;
 import org.apereo.cas.configuration.CasConfigurationProperties;
 import org.apereo.cas.oidc.claims.OidcAddressScopeAttributeReleasePolicy;
@@ -75,8 +77,10 @@ public class OIDCRPTOMapper implements ClientAppMapper {
             service.setIdTokenSigningAlg("none");
         }
         service.setJwtAccessToken(true);
-        service.setSupportedGrantTypes(new HashSet<>(rp.getSupportedGrantTypes()));
-        service.setSupportedResponseTypes(new HashSet<>(rp.getSupportedResponseTypes()));
+        service.setSupportedGrantTypes(rp.getSupportedGrantTypes().stream().
+                map(OIDCGrantType::name).collect(Collectors.toCollection(HashSet::new)));
+        service.setSupportedResponseTypes(rp.getSupportedResponseTypes().stream().
+                map(OIDCResponseType::getExternalForm).collect(Collectors.toCollection(HashSet::new)));
         if (rp.getSubjectType() != null) {
             service.setSubjectType(rp.getSubjectType().name());
         }
diff --git a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/SAML2SPTOMapper.java b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/SAML2SPTOMapper.java
index 5ab5990..704e7a7 100644
--- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/SAML2SPTOMapper.java
+++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/SAML2SPTOMapper.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.wa.starter.mapping;
 
+import java.util.stream.Collectors;
 import org.apache.syncope.common.lib.to.SAML2SPTO;
 import org.apache.syncope.common.lib.wa.WAClientApp;
 import org.apereo.cas.services.RegisteredService;
@@ -55,7 +56,9 @@ public class SAML2SPTOMapper implements ClientAppMapper {
         service.setRequiredNameIdFormat(sp.getRequiredNameIdFormat().getNameId());
         service.setSkewAllowance(sp.getSkewAllowance() == null ? 0 : sp.getSkewAllowance());
         service.setNameIdQualifier(sp.getNameIdQualifier());
-        service.setAssertionAudiences(sp.getAssertionAudiences());
+        if (!sp.getAssertionAudiences().isEmpty()) {
+            service.setAssertionAudiences(sp.getAssertionAudiences().stream().collect(Collectors.joining(",")));
+        }
         service.setServiceProviderNameIdQualifier(sp.getServiceProviderNameIdQualifier());
 
         if (authenticationPolicy != null) {
diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeWAServiceRegistryTest.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeWAServiceRegistryTest.java
index dfb0e47..48365cc 100644
--- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeWAServiceRegistryTest.java
+++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeWAServiceRegistryTest.java
@@ -34,6 +34,8 @@ import org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf;
 import org.apache.syncope.common.lib.policy.DefaultAuthPolicyCriteriaConf;
 import org.apache.syncope.common.lib.to.OIDCRPTO;
 import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.types.OIDCGrantType;
+import org.apache.syncope.common.lib.types.OIDCResponseType;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
 import org.apache.syncope.common.lib.wa.WAClientApp;
@@ -67,8 +69,8 @@ public class SyncopeWAServiceRegistryTest extends AbstractTest {
         oidcrpTO.setClientSecret("secret");
         oidcrpTO.getRedirectUris().addAll(List.of("uri1", "uri2"));
         oidcrpTO.setSubjectType(OIDCSubjectType.PUBLIC);
-        oidcrpTO.getSupportedGrantTypes().add("something");
-        oidcrpTO.getSupportedResponseTypes().add("something");
+        oidcrpTO.getSupportedGrantTypes().add(OIDCGrantType.password);
+        oidcrpTO.getSupportedResponseTypes().add(OIDCResponseType.CODE);
 
         return oidcrpTO;
     }