(syncope) branch master updated: [SYNCOPE-1818] fixes wrong status propagation while pulling a status update (#703)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 23f2e24906 [SYNCOPE-1818] fixes wrong status propagation while pulling
a status update (#703)
23f2e24906 is described below
commit 23f2e24906967955737b2ee0b3c72682d78cff14
Author: Andrea Patricelli
AuthorDate: Sat May 4 08:38:26 2024 +0200
[SYNCOPE-1818] fixes wrong status propagation while pulling a status update
(#703)
-
Co-authored-by: Francesco Chicchiriccò
---
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../java/DefaultUserProvisioningManager.java | 31 +-
.../pushpull/DefaultUserPullResultHandler.java | 2 +-
.../pushpull/DefaultUserPushResultHandler.java | 2 +-
.../core/workflow/api/UserWorkflowAdapter.java | 3 +-
.../workflow/java/AbstractUserWorkflowAdapter.java | 24 -
fit/build-tools/src/main/resources/testdb.sql | 1 +
.../apache/syncope/fit/core/PullTaskITCase.java| 12 +--
.../apache/syncope/fit/core/UserIssuesITCase.java | 112 +
11 files changed, 156 insertions(+), 43 deletions(-)
diff --git
a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
index df1b52f71e..a2702c8923 100644
--- a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
@@ -530,7 +530,7 @@ under the License.
location="connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}"
connectorName="net.tirasa.connid.bundles.db.table.DatabaseTableConnector"
displayName="H2-testpull" version="${connid.db.version}"
-
jsonConf='[{"schema":{"name":"changeLogColumn","displayName":"Change Log Column
(Sync)","helpMessage":"=bChange Log Column/bbrThe
change log column store the latest change time. Providing this value the Pull
capabilities are
activated.","type":"java.lang.String","required":false,"order":21,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"nativeTimestamps","displayName":"Native
Timestamps ","helpMessage" [...]
+
jsonConf='[{"schema":{"name":"changeLogColumn","displayName":"Change Log Column
(Sync)","helpMessage":"=bChange Log Column/bbrThe
change log column store the latest change time. Providing this value the Pull
capabilities are
activated.","type":"java.lang.String","required":false,"order":21,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"nativeTimestamps","displayName":"Native
Timestamps ","helpMessage" [...]
capabilities='["CREATE","UPDATE","DELETE","SEARCH"]'/>
@@ -772,7 +772,7 @@ under the License.
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
index 63653b2424..e3c17c14f5 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
@@ -38,7 +38,6 @@ import org.apache.syncope.common.lib.types.PatchOperation;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.StatusRType;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
-import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.core.provisioning.api.UserProvisioningManager;
import org.apache.syncope.core.provisioning.api.UserWorkflowResult;
@@ -128,7 +127,7 @@ public class DefaultUserProvisioningManager implements
UserProvisioningManager {
null,
Set.of());
-UserWorkflowResult> updated =
uwfAdapt
(syncope) branch 3_0_X updated: [SYNCOPE-1818] fixes wrong status propagation while pulling a status update (#703)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 4f1f43f166 [SYNCOPE-1818] fixes wrong status propagation while pulling
a status update (#703)
4f1f43f166 is described below
commit 4f1f43f166b0f95008a860c613b629b5bd1538f5
Author: Andrea Patricelli
AuthorDate: Sat May 4 08:38:26 2024 +0200
[SYNCOPE-1818] fixes wrong status propagation while pulling a status update
(#703)
-
Co-authored-by: Francesco Chicchiriccò
---
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../java/DefaultUserProvisioningManager.java | 30 +-
.../pushpull/DefaultUserPullResultHandler.java | 2 +-
.../pushpull/DefaultUserPushResultHandler.java | 2 +-
.../core/workflow/api/UserWorkflowAdapter.java | 3 +-
.../workflow/java/AbstractUserWorkflowAdapter.java | 24 -
fit/build-tools/src/main/resources/testdb.sql | 1 +
.../apache/syncope/fit/core/PullTaskITCase.java| 12 +--
.../apache/syncope/fit/core/UserIssuesITCase.java | 112 +
10 files changed, 154 insertions(+), 40 deletions(-)
diff --git
a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
index 579e6e6f0a..b4baef3a6f 100644
--- a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
@@ -533,7 +533,7 @@ under the License.
location="connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}"
connectorName="net.tirasa.connid.bundles.db.table.DatabaseTableConnector"
displayName="H2-testpull" version="${connid.db.version}"
-
jsonConf='[{"schema":{"name":"changeLogColumn","displayName":"Change Log Column
(Sync)","helpMessage":"=bChange Log Column/bbrThe
change log column store the latest change time. Providing this value the Pull
capabilities are
activated.","type":"java.lang.String","required":false,"order":21,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"nativeTimestamps","displayName":"Native
Timestamps ","helpMessage" [...]
+
jsonConf='[{"schema":{"name":"changeLogColumn","displayName":"Change Log Column
(Sync)","helpMessage":"=bChange Log Column/bbrThe
change log column store the latest change time. Providing this value the Pull
capabilities are
activated.","type":"java.lang.String","required":false,"order":21,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"nativeTimestamps","displayName":"Native
Timestamps ","helpMessage" [...]
capabilities='["CREATE","UPDATE","DELETE","SEARCH"]'/>
> updated =
uwfAdapter.update(userUR, updater, context);
+UserWorkflowResult> updated =
uwfAdapter.update(userUR, null, updater, context);
List taskInfos =
propagationManager.setAttributeDeltas(
propagationManager.getUserUpdateTasks(updated),
@@ -171,7 +170,7 @@ public class DefaultUserProvisioningManager implements
UserProvisioningManager {
UserWorkflowResult> updated;
try {
-updated = uwfAdapter.update(userUR, updater, context);
+updated = uwfAdapter.update(userUR, enabled, updater, context);
} catch (Exception e) {
LOG.error("Update of user {} failed, trying to pull its status
anyway (if configured)",
userUR.getKey(), e);
@@ -186,27 +185,6 @@ public class DefaultUserProvisioningManager implements
UserProvisioningManager {
new HashSet<>());
}
-if (enabled != null) {
-User user = userDAO.find(userUR.getKey());
-
-UserWorkflowResult enableUpdate = null;
-if (user.isSuspended() == null) {
-enableUpdate = uwfAdapter.activate(userUR.getKey(), null,
updater, context);
-} else if (enabled && user.isSuspended()) {
-enableUpdate = uwfAdapter.reactivate(userUR.getKey(), updater,
context);
-} else
(syncope) branch master updated: Ensure CXF WebClient to use async conduit (#664)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 d7618ab736 Ensure CXF WebClient to use async conduit (#664)
d7618ab736 is described below
commit d7618ab7369b04098c2bca9318474238d6ec9829
Author: Andrea Patricelli
AuthorDate: Thu Mar 28 11:06:16 2024 +0100
Ensure CXF WebClient to use async conduit (#664)
---
.../apache/syncope/client/console/pages/WA.java| 8 ++--
.../client/console/rest/AMSessionRestClient.java | 12 ++---
.../client/console/rest/SRASessionRestClient.java | 11 ++---
.../console/rest/SRAStatisticsRestClient.java | 8 ++--
.../client/console/rest/WASessionRestClient.java | 8 ++--
.../client/console/rest/ConnectorRestClient.java | 4 +-
.../client/console/rest/ResourceRestClient.java| 4 +-
.../client/console/rest/LoggerConfRestClient.java | 26 +--
.../syncope/client/lib/SyncopeAnonymousClient.java | 2 +-
.../syncope/client/lib/WebClientBuilder.java | 53 ++
common/keymaster/self/client-self/pom.xml | 4 ++
.../keymaster/client/self/SelfKeymasterOps.java| 2 +
12 files changed, 97 insertions(+), 45 deletions(-)
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 aaea9e5c87..43a9c9397d 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
@@ -29,7 +29,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.SyncopeWebApplication;
@@ -49,6 +48,7 @@ import
org.apache.syncope.client.console.rest.AuthProfileRestClient;
import org.apache.syncope.client.console.rest.WAConfigRestClient;
import org.apache.syncope.client.console.rest.WASessionRestClient;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.syncope.client.lib.WebClientBuilder;
import org.apache.syncope.common.keymaster.client.api.ServiceOps;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.lib.types.AMEntitlement;
@@ -128,12 +128,10 @@ public class WA extends BasePage {
if (!instances.isEmpty()) {
String actuatorEndpoint =
StringUtils.appendIfMissing(instances.get(0).getAddress(), "/") +
"actuator/env";
try {
-Response response = WebClient.create(
-actuatorEndpoint,
+Response response = WebClientBuilder.build(actuatorEndpoint,
SyncopeWebApplication.get().getAnonymousUser(),
SyncopeWebApplication.get().getAnonymousKey(),
-null).
-accept(MediaType.APPLICATION_JSON_TYPE).get();
+
List.of()).accept(MediaType.APPLICATION_JSON_TYPE).get();
if (response.getStatus() ==
Response.Status.OK.getStatusCode()) {
JsonNode env = MAPPER.readTree((InputStream)
response.getEntity());
if (env.has("propertySources")) {
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
index 60b3a4cbf2..9d188054c7 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
@@ -23,8 +23,8 @@ import
com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.List;
-import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.console.SyncopeWebApplication;
+import org.apache.syncope.client.lib.WebClientBuilder;
import org.apache.syncope.client.ui.commons.rest.RestClient;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.lib.AMSession;
@@ -56,13 +56,13 @@ public abstract class AMSessionRestClient implements
RestClient {
SyncopeClientException sce =
SyncopeClientException.build(ClientExceptionType.Unknown);
try {
-Response response = WebClient.create(
-getActuatorEndpoint(),
(syncope) branch 3_0_X updated: Ensure CXF WebClient to use async conduit (#664)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 34e8647971 Ensure CXF WebClient to use async conduit (#664)
34e8647971 is described below
commit 34e864797125350e9dcb1f324b65e3252b8482fa
Author: Andrea Patricelli
AuthorDate: Thu Mar 28 11:06:16 2024 +0100
Ensure CXF WebClient to use async conduit (#664)
---
.../apache/syncope/client/console/pages/WA.java| 8 ++--
.../client/console/rest/AMSessionRestClient.java | 12 ++---
.../client/console/rest/SRASessionRestClient.java | 11 ++---
.../console/rest/SRAStatisticsRestClient.java | 8 ++--
.../client/console/rest/WASessionRestClient.java | 8 ++--
.../client/console/rest/ConnectorRestClient.java | 4 +-
.../client/console/rest/ResourceRestClient.java| 4 +-
.../client/console/rest/LoggerConfRestClient.java | 26 +--
.../syncope/client/lib/SyncopeAnonymousClient.java | 2 +-
.../syncope/client/lib/WebClientBuilder.java | 53 ++
common/keymaster/self/client-self/pom.xml | 4 ++
.../keymaster/client/self/SelfKeymasterOps.java| 2 +
12 files changed, 97 insertions(+), 45 deletions(-)
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 e8dfebc152..f8abe5466a 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
@@ -29,7 +29,6 @@ import java.util.List;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.SyncopeWebApplication;
@@ -49,6 +48,7 @@ import
org.apache.syncope.client.console.rest.AuthProfileRestClient;
import org.apache.syncope.client.console.rest.WAConfigRestClient;
import org.apache.syncope.client.console.rest.WASessionRestClient;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.syncope.client.lib.WebClientBuilder;
import org.apache.syncope.common.keymaster.client.api.ServiceOps;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.lib.types.AMEntitlement;
@@ -128,12 +128,10 @@ public class WA extends BasePage {
if (!instances.isEmpty()) {
String actuatorEndpoint =
StringUtils.appendIfMissing(instances.get(0).getAddress(), "/") +
"actuator/env";
try {
-Response response = WebClient.create(
-actuatorEndpoint,
+Response response = WebClientBuilder.build(actuatorEndpoint,
SyncopeWebApplication.get().getAnonymousUser(),
SyncopeWebApplication.get().getAnonymousKey(),
-null).
-accept(MediaType.APPLICATION_JSON_TYPE).get();
+
List.of()).accept(MediaType.APPLICATION_JSON_TYPE).get();
if (response.getStatus() ==
Response.Status.OK.getStatusCode()) {
JsonNode env = MAPPER.readTree((InputStream)
response.getEntity());
if (env.has("propertySources")) {
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
index 9961719476..78fad08fb2 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java
@@ -23,8 +23,8 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import java.util.List;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.console.SyncopeWebApplication;
+import org.apache.syncope.client.lib.WebClientBuilder;
import org.apache.syncope.client.ui.commons.rest.RestClient;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.lib.AMSession;
@@ -56,13 +56,13 @@ public abstract class AMSessionRestClient implements
RestClient {
SyncopeClientException sce =
SyncopeClientException.build(ClientExceptionType.Unknown);
try {
-Response response = WebClient.create(
-getActuatorEndpoint(),
(syncope) branch master updated: [SYNCOPE-1809] Remove uidOnCreate attribute on delete propagation (#640)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 36fdf832a1 [SYNCOPE-1809] Remove uidOnCreate attribute on delete
propagation (#640)
36fdf832a1 is described below
commit 36fdf832a1274aeb7c47fcbec47804b5ec4fe808
Author: Andrea Patricelli
AuthorDate: Wed Mar 6 18:27:25 2024 +0100
[SYNCOPE-1809] Remove uidOnCreate attribute on delete propagation (#640)
* [SYNCOPE-1809] Remove uidOnCreate attribute on delete propagation
---
.../core/persistence/api/entity/AnyUtils.java | 2 +
.../common/CommonPersistenceContext.java | 46 --
.../persistence/common/entity/DefaultAnyUtils.java | 30 +
.../AbstractPropagationTaskExecutor.java | 21 ++
.../apache/syncope/fit/core/UserIssuesITCase.java | 74 ++
5 files changed, 169 insertions(+), 4 deletions(-)
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
index 8db658e6e8..a625e61dd0 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
@@ -61,4 +61,6 @@ public interface AnyUtils {
Set getAllResources(Any any);
void addAttr(PlainAttrValidationManager validator, String key, PlainSchema
schema, String value);
+
+void removeAttr(String key, PlainSchema schema);
}
diff --git
a/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/CommonPersistenceContext.java
b/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/CommonPersistenceContext.java
index 8725c08b32..d68c41c87d 100644
---
a/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/CommonPersistenceContext.java
+++
b/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/CommonPersistenceContext.java
@@ -24,6 +24,8 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
import
org.apache.syncope.core.persistence.api.attrvalue.PlainAttrValidationManager;
import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
+import org.apache.syncope.core.persistence.api.dao.PlainAttrValueDAO;
+import org.apache.syncope.core.persistence.api.dao.PlainSchemaDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.persistence.api.entity.AnyUtilsFactory;
@@ -78,9 +80,18 @@ public class CommonPersistenceContext {
final @Lazy UserDAO userDAO,
final @Lazy GroupDAO groupDAO,
final @Lazy AnyObjectDAO anyObjectDAO,
+final @Lazy PlainSchemaDAO plainSchemaDAO,
+final @Lazy PlainAttrValueDAO plainAttrValueDAO,
final @Lazy EntityFactory entityFactory) {
-return new DefaultAnyUtils(userDAO, groupDAO, anyObjectDAO,
entityFactory, AnyTypeKind.USER, false);
+return new DefaultAnyUtils(userDAO,
+groupDAO,
+anyObjectDAO,
+plainSchemaDAO,
+plainAttrValueDAO,
+entityFactory,
+AnyTypeKind.USER,
+false);
}
@Bean(name = "linkedAccountAnyUtils")
@@ -88,9 +99,18 @@ public class CommonPersistenceContext {
final @Lazy UserDAO userDAO,
final @Lazy GroupDAO groupDAO,
final @Lazy AnyObjectDAO anyObjectDAO,
+final @Lazy PlainSchemaDAO plainSchemaDAO,
+final @Lazy PlainAttrValueDAO plainAttrValueDAO,
final @Lazy EntityFactory entityFactory) {
-return new DefaultAnyUtils(userDAO, groupDAO, anyObjectDAO,
entityFactory, AnyTypeKind.USER, true);
+return new DefaultAnyUtils(userDAO,
+groupDAO,
+anyObjectDAO,
+plainSchemaDAO,
+plainAttrValueDAO,
+entityFactory,
+AnyTypeKind.USER,
+true);
}
@Bean(name = "groupAnyUtils")
@@ -98,9 +118,18 @@ public class CommonPersistenceContext {
final @Lazy UserDAO userDAO,
final @Lazy GroupDAO groupDAO,
final @Lazy AnyObjectDAO anyObjectDAO,
+final @Lazy PlainSchemaDAO plainSchemaDAO,
+final @Lazy PlainAttrValueDAO plainAttrValueDAO,
final @Lazy EntityFactory entityFactory) {
-return new DefaultAnyUtils(userDAO, groupDAO, anyObjectDAO,
entityFactory, AnyTypeKind.GROUP, false);
(syncope) branch 3_0_X updated: [SYNCOPE-1809] Remove uidOnCreate attribute on delete propagation (#640)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 55e7ed9224 [SYNCOPE-1809] Remove uidOnCreate attribute on delete
propagation (#640)
55e7ed9224 is described below
commit 55e7ed9224177051030ca45147d2435367699953
Author: Andrea Patricelli
AuthorDate: Wed Mar 6 18:27:25 2024 +0100
[SYNCOPE-1809] Remove uidOnCreate attribute on delete propagation (#640)
* [SYNCOPE-1809] Remove uidOnCreate attribute on delete propagation
---
.../core/persistence/api/entity/AnyUtils.java | 2 +
.../core/persistence/jpa/PersistenceContext.java | 4 +-
.../core/persistence/jpa/entity/JPAAnyUtils.java | 30 +
.../persistence/jpa/entity/JPAAnyUtilsFactory.java | 29 -
.../AbstractPropagationTaskExecutor.java | 15 +
.../apache/syncope/fit/core/UserIssuesITCase.java | 74 ++
6 files changed, 150 insertions(+), 4 deletions(-)
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
index 0ceb427afe..92d65ba86d 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
@@ -60,4 +60,6 @@ public interface AnyUtils {
Set getAllResources(Any any);
void addAttr(PlainAttrValidationManager validator, String key, PlainSchema
schema, String value);
+
+void removeAttr(String key, PlainSchema schema);
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
index 2f3cf23387..33f1e234c1 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
@@ -282,9 +282,11 @@ public class PersistenceContext {
final @Lazy UserDAO userDAO,
final @Lazy GroupDAO groupDAO,
final @Lazy AnyObjectDAO anyObjectDAO,
+final @Lazy PlainAttrDAO plainAttrDAO,
+final @Lazy PlainAttrValueDAO plainAttrValueDAO,
final @Lazy EntityFactory entityFactory) {
-return new JPAAnyUtilsFactory(userDAO, groupDAO, anyObjectDAO,
entityFactory);
+return new JPAAnyUtilsFactory(userDAO, groupDAO, anyObjectDAO,
plainAttrDAO, plainAttrValueDAO, entityFactory);
}
@ConditionalOnMissingBean
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
index 786709523b..fa7aca61e9 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
@@ -45,12 +45,15 @@ import
org.apache.syncope.core.persistence.api.attrvalue.validation.PlainAttrVal
import org.apache.syncope.core.persistence.api.dao.AnyDAO;
import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
+import org.apache.syncope.core.persistence.api.dao.PlainAttrDAO;
+import org.apache.syncope.core.persistence.api.dao.PlainAttrValueDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyTypeClass;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import org.apache.syncope.core.persistence.api.entity.ExternalResource;
+import org.apache.syncope.core.persistence.api.entity.GroupablePlainAttr;
import org.apache.syncope.core.persistence.api.entity.PlainAttr;
import org.apache.syncope.core.persistence.api.entity.PlainAttrUniqueValue;
import org.apache.syncope.core.persistence.api.entity.PlainAttrValue;
@@ -125,6 +128,10 @@ public class JPAAnyUtils implements AnyUtils {
protected final AnyObjectDAO anyObjectDAO;
+protected final PlainAttrDAO plainAttrDAO;
+
+protected final PlainAttrValueDAO plainAttrValueDAO;
+
protected final EntityFactory entityFactory;
protected final AnyTypeKind anyTypeKind;
@@ -135,6 +142,8 @@ public class JPAAnyUtils implements AnyUtils {
final UserDAO userDAO,
final GroupDAO groupDAO,
final AnyObjectDAO anyObjectDAO
(syncope) branch master updated: fixed logo rendering in Main Sidebar Container (#601)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 fd3f99724e fixed logo rendering in Main Sidebar Container (#601) fd3f99724e is described below commit fd3f99724edb0ff99bfd143b9afef26526826a9c Author: Albert Bici <47365826+os3alb...@users.noreply.github.com> AuthorDate: Tue Jan 16 08:39:55 2024 +0100 fixed logo rendering in Main Sidebar Container (#601) --- .../resources/org/apache/syncope/client/console/pages/BasePage.html | 4 ++-- .../resources/org/apache/syncope/client/enduser/panels/Sidebar.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html index 3325c1727c..0bbadc9b58 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html @@ -110,8 +110,8 @@ under the License. - - + + Apache Syncope diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html index 36bd619fad..4062f04a05 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html @@ -19,8 +19,8 @@ under the License. --> http://www.w3.org/1999/xhtml; xmlns:wicket="http://wicket.apache.org;> - - + + Apache Syncope
(syncope) branch 3_0_X updated: fixed logo rendering in Main Sidebar Container (#601)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 3_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/3_0_X by this push: new c33b7878c9 fixed logo rendering in Main Sidebar Container (#601) c33b7878c9 is described below commit c33b7878c9a092b8fc555c5068702c17416c6350 Author: Albert Bici <47365826+os3alb...@users.noreply.github.com> AuthorDate: Tue Jan 16 08:39:55 2024 +0100 fixed logo rendering in Main Sidebar Container (#601) --- .../resources/org/apache/syncope/client/console/pages/BasePage.html | 4 ++-- .../resources/org/apache/syncope/client/enduser/panels/Sidebar.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html index 3325c1727c..0bbadc9b58 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html @@ -110,8 +110,8 @@ under the License. - - + + Apache Syncope diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html index 36bd619fad..4062f04a05 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/panels/Sidebar.html @@ -19,8 +19,8 @@ under the License. --> http://www.w3.org/1999/xhtml; xmlns:wicket="http://wicket.apache.org;> - - + + Apache Syncope
[syncope] branch master updated: [SYNCOPE-1779] supporting underscore in search queries (#529)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 0f250a2316 [SYNCOPE-1779] supporting underscore in search queries
(#529)
0f250a2316 is described below
commit 0f250a2316c64c9f441574b50ef605ebbcb9d12f
Author: Andrea Patricelli
AuthorDate: Wed Oct 11 14:39:20 2023 +0200
[SYNCOPE-1779] supporting underscore in search queries (#529)
* [SYNCOPE-1779] supporting underscore in search queries, with specific
changes for Oracle DB
---
.../persistence/api/search/SearchCondVisitor.java | 3 +-
.../api/search/SearchCondConverterTest.java| 13
.../persistence/jpa/dao/OJPAJSONAnySearchDAO.java | 5 +++
.../core/persistence/jpa/dao/AbstractDAO.java | 22
.../core/persistence/jpa/dao/JPAAnySearchDAO.java | 5 +++
.../org/apache/syncope/fit/core/SearchITCase.java | 39 ++
6 files changed, 85 insertions(+), 2 deletions(-)
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
index 92de4a349e..6496411476 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
@@ -76,8 +76,7 @@ public class SearchCondVisitor extends
AbstractSearchConditionVisitor sc) {
String value = SearchUtils.toSqlWildcardString(
-URLDecoder.decode(sc.getStatement().getValue().toString(),
StandardCharsets.UTF_8), false).
-replaceAll("_", "_");
+URLDecoder.decode(sc.getStatement().getValue().toString(),
StandardCharsets.UTF_8), false);
// see SYNCOPE-1321
if (TIMEZONE.matcher(value).matches()) {
diff --git
a/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
b/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
index eff4efd305..a98dc321c9 100644
---
a/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
+++
b/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
@@ -329,4 +329,17 @@ public class SearchCondConverterTest {
assertEquals(SearchCond.getLeaf(cond),
SearchCondConverter.convert(VISITOR, fiql));
}
+
+@Test
+public void issueSYNCOPE1779() {
+String fiql = new
UserFiqlSearchConditionBuilder().is("username").equalToIgnoreCase("ros_*").query();
+assertEquals("username=~ros_*", fiql);
+
+AttrCond attrCond = new AnyCond(AttrCond.Type.ILIKE);
+attrCond.setSchema("username");
+attrCond.setExpression("ros\\_%");
+SearchCond leaf = SearchCond.getLeaf(attrCond);
+
+assertEquals(leaf, SearchCondConverter.convert(VISITOR, fiql));
+}
}
diff --git
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
index ad4aaa9434..67216ee358 100644
---
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
+++
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
@@ -244,6 +244,11 @@ public class OJPAJSONAnySearchDAO extends JPAAnySearchDAO {
query.append(lower ? "LOWER(" : "").
append('?').append(setParameter(parameters, value)).
append(lower ? ")" : "");
+// workaround for Oracle DB adding explicit escaping string, to
search
+// for literal _ (underscore) (SYNCOPE-1779)
+if (cond.getType() == AttrCond.Type.ILIKE || cond.getType() ==
AttrCond.Type.LIKE) {
+query.append(" ESCAPE '\\' ");
+}
}
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
index 6f3863ccdb..8a529246e4 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
@@ -20,7 +20,14 @@ package org.apache.syncope.core.persistence.jpa.d
[syncope] branch 3_0_X updated: [SYNCOPE-1779] supporting underscore in search queries (#529)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 2b4706a5e1 [SYNCOPE-1779] supporting underscore in search queries
(#529)
2b4706a5e1 is described below
commit 2b4706a5e11d69fa285ddaf9b25e91bfd9606fc9
Author: Andrea Patricelli
AuthorDate: Wed Oct 11 14:39:20 2023 +0200
[SYNCOPE-1779] supporting underscore in search queries (#529)
* [SYNCOPE-1779] supporting underscore in search queries, with specific
changes for Oracle DB
---
.../persistence/api/search/SearchCondVisitor.java | 3 +-
.../api/search/SearchCondConverterTest.java| 13
.../persistence/jpa/dao/OJPAJSONAnySearchDAO.java | 5 +++
.../core/persistence/jpa/dao/AbstractDAO.java | 22
.../core/persistence/jpa/dao/JPAAnySearchDAO.java | 5 +++
.../org/apache/syncope/fit/core/SearchITCase.java | 39 ++
6 files changed, 85 insertions(+), 2 deletions(-)
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
index 92de4a349e..6496411476 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
@@ -76,8 +76,7 @@ public class SearchCondVisitor extends
AbstractSearchConditionVisitor sc) {
String value = SearchUtils.toSqlWildcardString(
-URLDecoder.decode(sc.getStatement().getValue().toString(),
StandardCharsets.UTF_8), false).
-replaceAll("_", "_");
+URLDecoder.decode(sc.getStatement().getValue().toString(),
StandardCharsets.UTF_8), false);
// see SYNCOPE-1321
if (TIMEZONE.matcher(value).matches()) {
diff --git
a/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
b/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
index eff4efd305..a98dc321c9 100644
---
a/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
+++
b/core/persistence-api/src/test/java/org/apache/syncope/core/persistence/api/search/SearchCondConverterTest.java
@@ -329,4 +329,17 @@ public class SearchCondConverterTest {
assertEquals(SearchCond.getLeaf(cond),
SearchCondConverter.convert(VISITOR, fiql));
}
+
+@Test
+public void issueSYNCOPE1779() {
+String fiql = new
UserFiqlSearchConditionBuilder().is("username").equalToIgnoreCase("ros_*").query();
+assertEquals("username=~ros_*", fiql);
+
+AttrCond attrCond = new AnyCond(AttrCond.Type.ILIKE);
+attrCond.setSchema("username");
+attrCond.setExpression("ros\\_%");
+SearchCond leaf = SearchCond.getLeaf(attrCond);
+
+assertEquals(leaf, SearchCondConverter.convert(VISITOR, fiql));
+}
}
diff --git
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
index ad4aaa9434..67216ee358 100644
---
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
+++
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OJPAJSONAnySearchDAO.java
@@ -244,6 +244,11 @@ public class OJPAJSONAnySearchDAO extends JPAAnySearchDAO {
query.append(lower ? "LOWER(" : "").
append('?').append(setParameter(parameters, value)).
append(lower ? ")" : "");
+// workaround for Oracle DB adding explicit escaping string, to
search
+// for literal _ (underscore) (SYNCOPE-1779)
+if (cond.getType() == AttrCond.Type.ILIKE || cond.getType() ==
AttrCond.Type.LIKE) {
+query.append(" ESCAPE '\\' ");
+}
}
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
index bcefd68db7..cc238fc36a 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
@@ -18,9 +18,16 @@
*/
package org.apache.syncope.core.persisten
[syncope] branch master updated: [SYNCOPE-1751] moves random password generation to propagation task execution (#441)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 4d32d6e92e [SYNCOPE-1751] moves random password generation to
propagation task execution (#441)
4d32d6e92e is described below
commit 4d32d6e92ef959f11ba0076e1a15db40edbd61c5
Author: Andrea Patricelli
AuthorDate: Fri Apr 14 15:23:58 2023 +0200
[SYNCOPE-1751] moves random password generation to propagation task
execution (#441)
* [SYNCOPE-1751] moves random password generation to effective create on
external resource
-
Co-authored-by: Francesco Chicchiriccò
---
.../core/persistence/jpa/inner/UserTest.java | 6 +-
.../provisioning/java/DefaultMappingManager.java | 9 --
.../provisioning/java/ProvisioningContext.java | 8 +-
.../AbstractPropagationTaskExecutor.java | 176 ++---
.../PriorityPropagationTaskExecutor.java | 8 +-
.../provisioning/java/utils/ConnObjectUtils.java | 16 +-
.../java/DefaultMappingManagerTest.java| 8 +-
.../spring/security/DefaultPasswordGenerator.java | 14 +-
.../core/spring/security/PasswordGenerator.java| 3 +-
.../syncope/fit/core/LinkedAccountITCase.java | 4 +-
.../syncope/fit/core/PropagationTaskITCase.java| 34
11 files changed, 199 insertions(+), 87 deletions(-)
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
index 4d1467d22d..21ca8564b0 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
@@ -259,7 +259,8 @@ public class UserTest extends AbstractTest {
@Test
public void testPasswordGenerator() {
-String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"));
+String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"),
+List.of(realmDAO.getRoot()));
assertNotNull(password);
User user = userDAO.find("c9b2dec2-00a7-4855-97c0-d854842b4b24");
@@ -270,7 +271,8 @@ public class UserTest extends AbstractTest {
@Test
public void passwordGeneratorFailing() {
assertThrows(IllegalArgumentException.class, () -> {
-String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"));
+String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"),
+List.of(realmDAO.getRoot()));
assertNotNull(password);
User user = userDAO.find("c9b2dec2-00a7-4855-97c0-d854842b4b24");
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
index 4669e9c7ea..ee7c7ecadd 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
@@ -95,7 +95,6 @@ import
org.apache.syncope.core.provisioning.api.utils.FormatUtils;
import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.spring.security.Encryptor;
-import org.apache.syncope.core.spring.security.PasswordGenerator;
import org.identityconnectors.framework.common.FrameworkUtil;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
@@ -135,8 +134,6 @@ public class DefaultMappingManager implements
MappingManager {
protected final VirAttrCache virAttrCache;
-protected final PasswordGenerator passwordGenerator;
-
protected final AnyUtilsFactory anyUtilsFactory;
protected final IntAttrNameParser intAttrNameParser;
@@ -153,7 +150,6 @@ public class DefaultMappingManager implements
MappingManager {
final DerAttrHandler derAttrHandler,
final VirAttrHandler virAttrHandler,
final VirAttrCache virAttrCache,
-final PasswordGenerator passwordGenerator,
final AnyUtilsFactory anyUtilsFactory,
final IntAttrNameParser intAttrNameParser) {
@@ -168,7 +164,6 @@ public class DefaultMappingManager implements
MappingManager {
this.derAttrHandler
[syncope] branch 3_0_X updated: [SYNCOPE-1751] moves random password generation to propagation task execution (#441)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new e5d3a7e178 [SYNCOPE-1751] moves random password generation to
propagation task execution (#441)
e5d3a7e178 is described below
commit e5d3a7e178531c944c085c6833ead3d3022451f7
Author: Andrea Patricelli
AuthorDate: Fri Apr 14 15:23:58 2023 +0200
[SYNCOPE-1751] moves random password generation to propagation task
execution (#441)
* [SYNCOPE-1751] moves random password generation to effective create on
external resource
-
Co-authored-by: Francesco Chicchiriccò
---
.../core/persistence/jpa/inner/UserTest.java | 6 +-
.../provisioning/java/DefaultMappingManager.java | 9 --
.../provisioning/java/ProvisioningContext.java | 8 +-
.../AbstractPropagationTaskExecutor.java | 176 ++---
.../PriorityPropagationTaskExecutor.java | 8 +-
.../provisioning/java/utils/ConnObjectUtils.java | 16 +-
.../java/DefaultMappingManagerTest.java| 8 +-
.../spring/security/DefaultPasswordGenerator.java | 14 +-
.../core/spring/security/PasswordGenerator.java| 3 +-
.../syncope/fit/core/LinkedAccountITCase.java | 4 +-
.../syncope/fit/core/PropagationTaskITCase.java| 34
11 files changed, 199 insertions(+), 87 deletions(-)
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
index 4d1467d22d..21ca8564b0 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
@@ -259,7 +259,8 @@ public class UserTest extends AbstractTest {
@Test
public void testPasswordGenerator() {
-String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"));
+String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"),
+List.of(realmDAO.getRoot()));
assertNotNull(password);
User user = userDAO.find("c9b2dec2-00a7-4855-97c0-d854842b4b24");
@@ -270,7 +271,8 @@ public class UserTest extends AbstractTest {
@Test
public void passwordGeneratorFailing() {
assertThrows(IllegalArgumentException.class, () -> {
-String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"));
+String password =
passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"),
+List.of(realmDAO.getRoot()));
assertNotNull(password);
User user = userDAO.find("c9b2dec2-00a7-4855-97c0-d854842b4b24");
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
index 4669e9c7ea..ee7c7ecadd 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
@@ -95,7 +95,6 @@ import
org.apache.syncope.core.provisioning.api.utils.FormatUtils;
import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.spring.security.Encryptor;
-import org.apache.syncope.core.spring.security.PasswordGenerator;
import org.identityconnectors.framework.common.FrameworkUtil;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
@@ -135,8 +134,6 @@ public class DefaultMappingManager implements
MappingManager {
protected final VirAttrCache virAttrCache;
-protected final PasswordGenerator passwordGenerator;
-
protected final AnyUtilsFactory anyUtilsFactory;
protected final IntAttrNameParser intAttrNameParser;
@@ -153,7 +150,6 @@ public class DefaultMappingManager implements
MappingManager {
final DerAttrHandler derAttrHandler,
final VirAttrHandler virAttrHandler,
final VirAttrCache virAttrCache,
-final PasswordGenerator passwordGenerator,
final AnyUtilsFactory anyUtilsFactory,
final IntAttrNameParser intAttrNameParser) {
@@ -168,7 +164,6 @@ public class DefaultMappingManager implements
MappingManager {
this.derAttrHandler
[syncope] branch master updated: [SYNCOPE-1732] Support generic access policy configuration through BeanPanel (#413)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 34a9c8c0ef [SYNCOPE-1732] Support generic access policy configuration
through BeanPanel (#413)
34a9c8c0ef is described below
commit 34a9c8c0ef8efa1f4fe28625afca3600d95a9557
Author: Andrea Patricelli
AuthorDate: Thu Feb 23 14:11:57 2023 +0100
[SYNCOPE-1732] Support generic access policy configuration through
BeanPanel (#413)
* [SYNCOPE-1732] support generic access policy configuration through bean
panel
---
.../policies/AccessPolicyDirectoryPanel.java | 45 -
.../console/policies/AccessPolicyModalPanel.java | 102 +
.../console/policies/AccessPolicyModalPanel.html | 6 +-
.../syncope/client/ui/commons/Constants.java | 4 +-
.../syncope/client/console/panels/BeanPanel.java | 6 +-
.../common/lib/policy/DefaultAccessPolicyConf.java | 24 +++--
.../syncope/common/lib/SerializationTest.java | 4 +-
.../jpa/inner/AbstractClientAppTest.java | 3 +-
.../core/persistence/jpa/inner/PolicyTest.java | 3 +-
.../org/apache/syncope/fit/AbstractITCase.java | 2 +-
.../org/apache/syncope/fit/core/PolicyITCase.java | 11 +--
.../org/apache/syncope/fit/core/RealmITCase.java | 3 +-
.../wa/starter/mapping/DefaultAccessMapper.java| 10 +-
.../syncope/wa/starter/WAServiceRegistryTest.java | 3 +-
14 files changed, 39 insertions(+), 187 deletions(-)
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
index 4261ad8236..a9e2232450 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
@@ -19,7 +19,6 @@
package org.apache.syncope.client.console.policies;
import java.util.List;
-import org.apache.syncope.client.console.panels.ModalDirectoryPanel;
import org.apache.syncope.client.console.rest.PolicyRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel;
@@ -92,49 +91,5 @@ public class AccessPolicyDirectoryPanel extends
PolicyDirectoryPanel() {
-
-private static final long serialVersionUID =
-3722207913631435501L;
-
-@Override
-public void onClick(final AjaxRequestTarget target, final
AccessPolicyTO ignore) {
-model.setObject(PolicyRestClient.read(type,
model.getObject().getKey()));
-target.add(ruleCompositionModal.setContent(new
ModalDirectoryPanel<>(
-ruleCompositionModal,
-new AccessPolicyAttrsDirectoryPanel(
-"panel",
-ruleCompositionModal,
-model,
-DefaultAccessPolicyConf::getRequiredAttrs,
-pageRef),
-pageRef)));
-ruleCompositionModal.header(new
Model<>(getString("requiredAttrs.title", model)));
-ruleCompositionModal.show(true);
-}
-}, ActionLink.ActionType.TYPE_EXTENSIONS,
IdRepoEntitlement.POLICY_UPDATE);
-
-panel.add(new ActionLink<>() {
-
-private static final long serialVersionUID =
-3722207913631435501L;
-
-@Override
-public void onClick(final AjaxRequestTarget target, final
AccessPolicyTO ignore) {
-model.setObject(PolicyRestClient.read(type,
model.getObject().getKey()));
-target.add(ruleCompositionModal.setContent(new
ModalDirectoryPanel<>(
-ruleCompositionModal,
-new AccessPolicyAttrsDirectoryPanel(
-"panel",
-ruleCompositionModal,
-model,
-DefaultAccessPolicyConf::getRejectedAttrs,
-pageRef),
-pageRef)));
-ruleCompositionModal.header(new
Model<>(getString("rejectedAttrs.title", model)));
-ruleCompositionModal.show(true);
-}
-}, ActionLink.ActionType.CLAIM, IdRepoEntitlement.POLICY_UPDATE);
-}
}
}
diff --git
a/client/am/console/src/main/java/
[syncope] branch 3_0_X updated: [SYNCOPE-1732] Support generic access policy configuration through BeanPanel (#413)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new dc5638b07e [SYNCOPE-1732] Support generic access policy configuration
through BeanPanel (#413)
dc5638b07e is described below
commit dc5638b07ebf703659d7a41bf7f6af8728d65f81
Author: Andrea Patricelli
AuthorDate: Thu Feb 23 14:11:57 2023 +0100
[SYNCOPE-1732] Support generic access policy configuration through
BeanPanel (#413)
* [SYNCOPE-1732] support generic access policy configuration through bean
panel
---
.../policies/AccessPolicyDirectoryPanel.java | 45 -
.../console/policies/AccessPolicyModalPanel.java | 102 +
.../console/policies/AccessPolicyModalPanel.html | 6 +-
.../syncope/client/ui/commons/Constants.java | 4 +-
.../syncope/client/console/panels/BeanPanel.java | 6 +-
.../common/lib/policy/DefaultAccessPolicyConf.java | 24 +++--
.../syncope/common/lib/SerializationTest.java | 4 +-
.../jpa/inner/AbstractClientAppTest.java | 3 +-
.../core/persistence/jpa/inner/PolicyTest.java | 3 +-
.../org/apache/syncope/fit/AbstractITCase.java | 2 +-
.../org/apache/syncope/fit/core/PolicyITCase.java | 11 +--
.../org/apache/syncope/fit/core/RealmITCase.java | 3 +-
.../wa/starter/mapping/DefaultAccessMapper.java| 10 +-
.../syncope/wa/starter/WAServiceRegistryTest.java | 3 +-
14 files changed, 39 insertions(+), 187 deletions(-)
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
index 4261ad8236..a9e2232450 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyDirectoryPanel.java
@@ -19,7 +19,6 @@
package org.apache.syncope.client.console.policies;
import java.util.List;
-import org.apache.syncope.client.console.panels.ModalDirectoryPanel;
import org.apache.syncope.client.console.rest.PolicyRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel;
@@ -92,49 +91,5 @@ public class AccessPolicyDirectoryPanel extends
PolicyDirectoryPanel() {
-
-private static final long serialVersionUID =
-3722207913631435501L;
-
-@Override
-public void onClick(final AjaxRequestTarget target, final
AccessPolicyTO ignore) {
-model.setObject(PolicyRestClient.read(type,
model.getObject().getKey()));
-target.add(ruleCompositionModal.setContent(new
ModalDirectoryPanel<>(
-ruleCompositionModal,
-new AccessPolicyAttrsDirectoryPanel(
-"panel",
-ruleCompositionModal,
-model,
-DefaultAccessPolicyConf::getRequiredAttrs,
-pageRef),
-pageRef)));
-ruleCompositionModal.header(new
Model<>(getString("requiredAttrs.title", model)));
-ruleCompositionModal.show(true);
-}
-}, ActionLink.ActionType.TYPE_EXTENSIONS,
IdRepoEntitlement.POLICY_UPDATE);
-
-panel.add(new ActionLink<>() {
-
-private static final long serialVersionUID =
-3722207913631435501L;
-
-@Override
-public void onClick(final AjaxRequestTarget target, final
AccessPolicyTO ignore) {
-model.setObject(PolicyRestClient.read(type,
model.getObject().getKey()));
-target.add(ruleCompositionModal.setContent(new
ModalDirectoryPanel<>(
-ruleCompositionModal,
-new AccessPolicyAttrsDirectoryPanel(
-"panel",
-ruleCompositionModal,
-model,
-DefaultAccessPolicyConf::getRejectedAttrs,
-pageRef),
-pageRef)));
-ruleCompositionModal.header(new
Model<>(getString("rejectedAttrs.title", model)));
-ruleCompositionModal.show(true);
-}
-}, ActionLink.ActionType.CLAIM, IdRepoEntitlement.POLICY_UPDATE);
-}
}
}
diff --git
a/client/am/console/src/main/java/
[syncope] branch 3_0_X updated: [SYNCOPE-1728] fixes wrong label in BeanPanel and avoid not serializa… (#408)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 1b6e343dc5 [SYNCOPE-1728] fixes wrong label in BeanPanel and avoid not
serializa… (#408)
1b6e343dc5 is described below
commit 1b6e343dc5d5ad176842c4bc22e0090902660ddb
Author: Andrea Patricelli
AuthorDate: Wed Feb 8 10:05:17 2023 +0100
[SYNCOPE-1728] fixes wrong label in BeanPanel and avoid not serializa…
(#408)
* [SYNCOPE-1728] fixes wrong label in BeanPanel and avoid not serializable
exception
---
.../syncope/client/console/panels/BeanPanel.java | 35 +++---
1 file changed, 18 insertions(+), 17 deletions(-)
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 bb945460b5..bc3e8079a3 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
@@ -248,7 +248,8 @@ public class BeanPanel extends
Panel {
new
ListModel(List.of(listItemType.getEnumConstants(.hideLabel();
} else {
Triple> single =
-buildSinglePanel(bean.getObject(),
field.getType(), field, "value");
+buildSinglePanel(bean.getObject(),
field.getType(), field.getName(),
+
field.getAnnotation(io.swagger.v3.oas.annotations.media.Schema.class), "panel");
setRequired(item, single.getMiddle());
single.getRight().ifPresent(description ->
setDescription(item, description));
@@ -264,7 +265,8 @@ public class BeanPanel extends
Panel {
"value", fieldName, new PropertyModel<>(bean,
fieldName)).hideLabel();
} else {
Triple> single =
-buildSinglePanel(bean.getObject(),
field.getType(), field, "value");
+buildSinglePanel(bean.getObject(),
field.getType(), field.getName(),
+
field.getAnnotation(io.swagger.v3.oas.annotations.media.Schema.class), "value");
setRequired(item, single.getMiddle());
single.getRight().ifPresent(description ->
setDescription(item, description));
@@ -277,35 +279,36 @@ public class BeanPanel extends
Panel {
}.setReuseItems(true).setOutputMarkupId(true));
}
-@SuppressWarnings({ "unchecked", "rawtypes" })
-private static Triple>
buildSinglePanel(
-final Serializable bean, final Class type, final Field field,
final String id) {
+@SuppressWarnings({"unchecked", "rawtypes"})
+private Triple> buildSinglePanel(
+final Serializable bean, final Class type, final String
fieldName,
+final io.swagger.v3.oas.annotations.media.Schema schema, final
String id) {
-PropertyModel model = new PropertyModel<>(bean, field.getName());
+PropertyModel model = new PropertyModel<>(bean, fieldName);
FieldPanel panel;
if (ClassUtils.isAssignable(Boolean.class, type)) {
-panel = new AjaxCheckBoxPanel(id, field.getName(), model);
+panel = new AjaxCheckBoxPanel(id, fieldName, model);
} else if (ClassUtils.isAssignable(Number.class, type)) {
panel = new AjaxSpinnerFieldPanel.Builder<>().build(
-id, field.getName(), (Class)
ClassUtils.resolvePrimitiveIfNecessary(type), model);
+id, fieldName, (Class)
ClassUtils.resolvePrimitiveIfNecessary(type), model);
} else if (Date.class.equals(type)) {
-panel = new AjaxDateTimeFieldPanel(id, field.getName(), model,
+panel = new AjaxDateTimeFieldPanel(id, fieldName, model,
DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT);
} else if (OffsetDateTime.class.equals(type)) {
-panel = new AjaxDateTimeFieldPanel(id, field.getName(), new
DateOps.WrappedDateModel(model),
+panel = new AjaxDateTimeFieldPanel(id, fieldName, new
DateOps.WrappedDateModel(model),
DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT);
} else if (type.isEnum()) {
-panel = new AjaxDropDownChoicePanel(id, field.getName(), model).
+panel = new AjaxDropDownChoicePanel(id, fieldName, model).
setChoices(List.of(type.getEnumConstants
[syncope] branch master updated: [SYNCOPE-1698] added check to avoid adding to the provision already p… (#377)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 5f76fce39a [SYNCOPE-1698] added check to avoid adding to the provision
already p… (#377)
5f76fce39a is described below
commit 5f76fce39abed1828128e27f7494a0628c66752d
Author: Andrea Patricelli
AuthorDate: Wed Sep 28 14:59:42 2022 +0200
[SYNCOPE-1698] added check to avoid adding to the provision already p…
(#377)
* [SYNCOPE-1698] added check to avoid adding to the provision already
present aux classes
---
.../syncope/core/provisioning/java/data/ResourceDataBinderImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
index b86f460a3a..b079950ce3 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
@@ -166,8 +166,9 @@ public class ResourceDataBinderImpl implements
ResourceDataBinder {
// add all classes contained in the TO
for (String name : provisionTO.getAuxClasses()) {
AnyTypeClass anyTypeClass = anyTypeClassDAO.find(name);
-if (anyTypeClass == null) {
-LOG.warn("Ignoring invalid {}: {}",
AnyTypeClass.class.getSimpleName(), name);
+if (anyTypeClass == null ||
provision.getAuxClasses().contains(name)) {
+LOG.warn("Ignoring invalid or already present {}: {}",
AnyTypeClass.class.getSimpleName(),
+name);
} else {
provision.getAuxClasses().add(anyTypeClass.getKey());
}
[syncope] branch master updated: SYNCOPE-1695 audit view improvements (#376)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 1c7548c4b1 SYNCOPE-1695 audit view improvements (#376)
1c7548c4b1 is described below
commit 1c7548c4b14a65e33e7418d9a0873089f9ec4bd1
Author: Andrea Patricelli
AuthorDate: Wed Sep 28 09:12:22 2022 +0200
SYNCOPE-1695 audit view improvements (#376)
* [SYNCOPE-1695] refactored audit view, added possibility to move across
versions
---
.../console/panels/ConnectorDirectoryPanel.java| 4 +-
.../console/panels/ResourceDirectoryPanel.java | 4 +-
.../console/topology/TopologyTogglePanel.java | 16 +-
.../client/console/audit/AuditHistoryDetails.java | 213 +
.../console/audit/AuditHistoryDirectoryPanel.java | 192 ---
.../client/console/audit/AuditHistoryModal.java| 24 +--
.../console/panels/AnyObjectDirectoryPanel.java| 4 +-
.../client/console/panels/GroupDirectoryPanel.java | 4 +-
.../client/console/panels/UserDirectoryPanel.java | 9 +-
.../wicket/markup/html/form/JsonDiffPanel.java | 33 ++--
.../META-INF/resources/css/syncopeConsole.scss | 20 +-
.../client/console/audit/AuditHistoryDetails.html | 18 +-
.../console/audit/AuditHistoryDetails.properties | 4 +-
.../audit/AuditHistoryDetails_fr_CA.properties | 7 +-
.../audit/AuditHistoryDetails_it.properties| 7 +-
.../audit/AuditHistoryDetails_ja.properties| 9 +-
.../audit/AuditHistoryDetails_pt_BR.properties | 8 +-
.../audit/AuditHistoryDetails_ru.properties| 8 +-
.../syncope/common/lib/types/AuditElements.java| 26 +--
.../syncope/common/lib/types/AuditLoggerName.java | 8 +-
.../org/apache/syncope/core/logic/AuditLogic.java | 6 +-
.../java/pushpull/AbstractPushResultHandler.java | 6 +-
.../org/apache/syncope/fit/core/AuditITCase.java | 90 -
.../apache/syncope/fit/core/PushTaskITCase.java| 4 +-
.../reference-guide/concepts/notifications.adoc| 2 +-
25 files changed, 370 insertions(+), 356 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
index 69035c0e6a..915995d2b2 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
@@ -188,12 +188,10 @@ public class ConnectorDirectoryPanel extends
ConnInstanceTO modelObject =
ConnectorRestClient.read(((ConnInstanceTO) model.getObject()).getKey());
target.add(altDefaultModal.setContent(new AuditHistoryModal<>(
- altDefaultModal,
AuditElements.EventCategoryType.LOGIC,
"ConnectorLogic",
modelObject,
- IdMEntitlement.CONNECTOR_UPDATE,
- pageRef) {
+ IdMEntitlement.CONNECTOR_UPDATE) {
private static final long serialVersionUID =
-3225348282675513648L;
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
index b5654d7d91..81cd889938 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
@@ -303,12 +303,10 @@ public class ResourceDirectoryPanel extends
ResourceTO modelObject = ResourceRestClient.read(((ResourceTO)
model.getObject()).getKey());
target.add(historyModal.setContent(new AuditHistoryModal<>(
-historyModal,
AuditElements.EventCategoryType.LOGIC,
"ResourceLogic",
modelObject,
-IdMEntitlement.RESOURCE_UPDATE,
-pageRef) {
+IdMEntitlement.RESOURCE_UPDATE) {
private static final long serialVersionUID =
-3712506022627033811L;
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
index 1ca1ce27aa..a45072f82c 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
+++
b/clie
[syncope] branch master updated: [SYNCOPE-1665] show error on propagation failure, made some refactoring (#363)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 f6735a8389 [SYNCOPE-1665] show error on propagation failure, made some
refactoring (#363)
f6735a8389 is described below
commit f6735a83898d6a0d64ff8308e52534cb51d1976c
Author: Andrea Patricelli
AuthorDate: Mon Sep 12 10:02:43 2022 +0200
[SYNCOPE-1665] show error on propagation failure, made some refactoring
(#363)
* [SYNCOPE-1665] show error in enduser on propagation failure if enabled by
configuration
---
...AnyDirectoryPanelAdditionalActionsProvider.java | 8 +-
.../console/panels/ConnectorDirectoryPanel.java| 2 +-
.../client/console/panels/ConnidLocations.java | 2 +-
.../console/panels/ResourceDirectoryPanel.java | 2 +-
.../syncope/client/ui/commons/Constants.java | 4 +
.../ui/commons/panels/SimpleListViewPanel.java | 250 +
.../client/ui/commons/status/StatusUtils.java | 5 +
.../commons/wizards/any/AbstractResultPanel.java | 54 +
.../ui/commons/panels/SimpleListViewPanel.html}| 25 ++-
.../commons/panels/SimpleListViewPanel.properties} | 4 +-
.../panels/SimpleListViewPanel_fr_CA.properties} | 4 +-
.../panels/SimpleListViewPanel_it.properties} | 4 +-
.../panels/SimpleListViewPanel_ja.properties} | 4 +-
.../panels/SimpleListViewPanel_pt_BR.properties} | 4 +-
.../panels/SimpleListViewPanel_ru.properties} | 7 +-
.../commons/wizards/any/AbstractResultPanel.html} | 9 +-
.../syncope/client/console/pages/Realms.java | 6 +-
.../console/panels/AccessTokenDirectoryPanel.java | 2 +-
.../console/panels/ApplicationDirectoryPanel.java | 2 +-
.../console/panels/DelegationDirectoryPanel.java | 2 +-
.../console/panels/DynRealmDirectoryPanel.java | 2 +-
.../syncope/client/console/panels/Realm.java | 2 +-
.../client/console/panels/RoleDirectoryPanel.java | 2 +-
.../panels/TypeExtensionDirectoryPanel.java| 2 +-
.../client/console/tasks/TaskDirectoryPanel.java | 6 +-
.../client/console/wizards/WizardMgtPanel.java | 19 +-
.../any/{ResultPage.java => ResultPanel.java} | 30 +--
.../any/{ResultPage.html => ResultPanel.html} | 4 +-
...esultPage.properties => ResultPanel.properties} | 0
..._CA.properties => ResultPanel_fr_CA.properties} | 0
...age_it.properties => ResultPanel_it.properties} | 0
...age_ja.properties => ResultPanel_ja.properties} | 0
..._BR.properties => ResultPanel_pt_BR.properties} | 0
...age_ru.properties => ResultPanel_ru.properties} | 0
.../console/wizards/any/StatusPanel_ru.properties | 6 +-
.../syncope/client/enduser/EnduserProperties.java | 21 +-
.../client/enduser/SyncopeWebApplication.java | 8 +
.../client/enduser/commons/EnduserConstants.java | 4 +-
.../client/enduser/commons/ProvisioningUtils.java | 67 ++
.../client/enduser/pages/EditChangePassword.java | 39 ++--
.../client/enduser/pages/EditSecurityQuestion.java | 67 +++---
.../syncope/client/enduser/pages/SelfResult.java | 36 ++-
.../syncope/client/enduser/panels/ResultPanel.java | 65 ++
.../client/enduser/panels/UserFormPanel.java | 43 ++--
.../client/enduser/panels/UserSelfFormPanel.java | 48 ++--
.../enduser/src/main/resources/enduser.properties | 2 +
.../enduser/SyncopeEnduserApplication.properties | 1 +
.../SyncopeEnduserApplication_fr_CA.properties | 1 +
.../SyncopeEnduserApplication_it.properties| 1 +
.../SyncopeEnduserApplication_ja.properties| 116 +-
.../SyncopeEnduserApplication_pt_BR.properties | 2 +
.../SyncopeEnduserApplication_ru.properties| 100 +
.../enduser/pages/EditChangePassword.properties| 4 +-
.../enduser/pages/EditChangePassword_it.properties | 2 +-
.../pages/EditSecurityQuestion_it.properties | 2 +-
.../enduser/pages/MustChangePassword_it.properties | 2 +-
.../pages/SelfConfirmPasswordReset.properties | 4 +-
.../pages/SelfConfirmPasswordReset_it.properties | 4 +-
.../syncope/client/enduser/pages/SelfResult.html | 77 ---
.../client/enduser/pages/SelfResult.properties | 2 +
.../enduser/pages/SelfResult_fr_CA.properties | 4 +-
.../client/enduser/pages/SelfResult_it.properties | 2 +
.../client/enduser/pages/SelfResult_ja.properties | 4 +-
.../enduser/pages/SelfResult_pt_BR.properties | 4 +-
.../client/enduser/pages/SelfResult_ru.properties | 4 +-
.../client/enduser/panels/ResultPanel.html}| 7 +-
.../client/enduser/panels/UserFormPanel.properties | 4 +-
.../enduser/panels/UserFormPanel_it.properties | 2 +-
.../enduser/panels/UserFormPanel_ja.properties | 8 +-
.../enduser/panels/UserFormPanel
[syncope] branch master updated: [SYNCOPE-1666] linked account must have AES as encryption algorithm (#334)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 7c856eb [SYNCOPE-1666] linked account must have AES as encryption
algorithm (#334)
7c856eb is described below
commit 7c856ebbfbd352cffda8bbfad737ad32840d74c9
Author: Andrea Patricelli
AuthorDate: Thu Mar 31 16:14:13 2022 +0200
[SYNCOPE-1666] linked account must have AES as encryption algorithm (#334)
---
.../core/provisioning/java/data/UserDataBinderImpl.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index 0d4a345..393d5d3 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -52,7 +52,6 @@ import
org.apache.syncope.core.persistence.api.dao.AnyTypeClassDAO;
import org.apache.syncope.core.persistence.api.dao.SecurityQuestionDAO;
import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.api.entity.resource.Item;
-import org.apache.syncope.core.persistence.api.entity.user.Account;
import org.apache.syncope.core.persistence.api.entity.user.SecurityQuestion;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
@@ -210,9 +209,9 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
}
}
-private void setCipherAlgorithm(final Account account) {
-if (account.getCipherAlgorithm() == null) {
-
account.setCipherAlgorithm(CipherAlgorithm.valueOf(confParamOps.get(AuthContextUtils.getDomain(),
+private void setCipherAlgorithm(final User user) {
+if (user.getCipherAlgorithm() == null) {
+
user.setCipherAlgorithm(CipherAlgorithm.valueOf(confParamOps.get(AuthContextUtils.getDomain(),
"password.cipher.algorithm", CipherAlgorithm.AES.name(),
String.class)));
}
}
@@ -260,7 +259,9 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
if (StringUtils.isBlank(accountTO.getPassword())) {
account.setEncodedPassword(null, null);
} else if (!accountTO.getPassword().equals(account.getPassword()))
{
-setCipherAlgorithm(account);
+if (account.getCipherAlgorithm() == null) {
+account.setCipherAlgorithm(CipherAlgorithm.AES);
+}
account.setPassword(accountTO.getPassword());
}
account.setSuspended(accountTO.isSuspended());
[syncope] branch 2_1_X updated: [SYNCOPE-1666] linked account must have AES as encryption algorithm (#333)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 50e10e6 [SYNCOPE-1666] linked account must have AES as encryption
algorithm (#333)
50e10e6 is described below
commit 50e10e6cdb119121a1d405f16612b5429564f26b
Author: Andrea Patricelli
AuthorDate: Thu Mar 31 14:16:47 2022 +0200
[SYNCOPE-1666] linked account must have AES as encryption algorithm (#333)
* [SYNCOPE-1666] linked account must have AES as encryption algorithm
---
.../core/provisioning/java/data/UserDataBinderImpl.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index a6b98cb..606254e 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -50,7 +50,6 @@ import
org.apache.syncope.core.persistence.api.dao.AccessTokenDAO;
import org.apache.syncope.core.persistence.api.dao.ConfDAO;
import org.apache.syncope.core.persistence.api.dao.SecurityQuestionDAO;
import org.apache.syncope.core.persistence.api.entity.group.Group;
-import org.apache.syncope.core.persistence.api.entity.user.Account;
import org.apache.syncope.core.persistence.api.entity.user.SecurityQuestion;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
@@ -153,9 +152,9 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
}
}
-private void setCipherAlgorithm(final Account account) {
-if (account.getCipherAlgorithm() == null) {
-account.setCipherAlgorithm(
+private void setCipherAlgorithm(final User user) {
+if (user.getCipherAlgorithm() == null) {
+user.setCipherAlgorithm(
CipherAlgorithm.valueOf(confDAO.find("password.cipher.algorithm",
CipherAlgorithm.AES.name(;
}
}
@@ -203,7 +202,9 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
if (StringUtils.isBlank(accountTO.getPassword())) {
account.setEncodedPassword(null, null);
} else if (!accountTO.getPassword().equals(account.getPassword()))
{
-setCipherAlgorithm(account);
+if (account.getCipherAlgorithm() == null) {
+account.setCipherAlgorithm(CipherAlgorithm.AES);
+}
account.setPassword(accountTO.getPassword());
}
account.setSuspended(accountTO.isSuspended());
[syncope] branch master updated: Fix for classpath scan (#329)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 8d9a862 Fix for classpath scan (#329)
8d9a862 is described below
commit 8d9a8624cb5c62d37eb11572d1bc167c6af6c6b2
Author: Andrea Patricelli
AuthorDate: Tue Mar 22 09:10:15 2022 +0100
Fix for classpath scan (#329)
* fixes search for implementation classes in console
* moved to CorrelationRule class from CorrelationRuleConf in
IdMImplementationType
---
.../console/init/IdMClassPathScanImplementationContributor.java | 9 +
.../apache/syncope/common/lib/types/IdMImplementationType.java | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
index f141331..45c9209 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
@@ -34,10 +34,11 @@ public class IdMClassPathScanImplementationContributor
implements ClassPathScanI
@Override
public Optional getLabel(final Class clazz) {
-if (PullCorrelationRuleConf.class.isAssignableFrom(clazz)
-|| PushCorrelationRuleConf.class.isAssignableFrom(clazz)) {
-
-return Optional.of(clazz.getName());
+if (PullCorrelationRuleConf.class.isAssignableFrom(clazz)) {
+return Optional.of(PullCorrelationRuleConf.class.getName());
+}
+if (PushCorrelationRuleConf.class.isAssignableFrom(clazz)) {
+return Optional.of(PushCorrelationRuleConf.class.getName());
}
return Optional.empty();
}
diff --git
a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
index 37765b2..c39ee36 100644
---
a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
+++
b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
@@ -42,8 +42,8 @@ public final class IdMImplementationType {
Pair.of(PROPAGATION_ACTIONS,
"org.apache.syncope.core.provisioning.api.propagation.PropagationActions"),
Pair.of(PULL_ACTIONS,
"org.apache.syncope.core.provisioning.api.pushpull.PullActions"),
Pair.of(PUSH_ACTIONS,
"org.apache.syncope.core.provisioning.api.pushpull.PushActions"),
-Pair.of(PULL_CORRELATION_RULE,
"org.apache.syncope.common.lib.policy.PullCorrelationRuleConf"),
-Pair.of(PUSH_CORRELATION_RULE,
"org.apache.syncope.common.lib.policy.PushCorrelationRuleConf"),
+Pair.of(PULL_CORRELATION_RULE,
"org.apache.syncope.core.persistence.api.dao.PullCorrelationRule"),
+Pair.of(PUSH_CORRELATION_RULE,
"org.apache.syncope.core.persistence.api.dao.PushCorrelationRule"),
Pair.of(PROVISION_SORTER,
"org.apache.syncope.core.provisioning.api.ProvisionSorter"));
public static Map values() {
[syncope] branch master updated: [SYNCOPE-1666] added security answer hashing (#319) (#321)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 b4a41e0 [SYNCOPE-1666] added security answer hashing (#319) (#321)
b4a41e0 is described below
commit b4a41e0e41f6c8c9b2ca1afc9ce7e19efd485bcf
Author: Andrea Patricelli
AuthorDate: Fri Mar 4 18:00:12 2022 +0100
[SYNCOPE-1666] added security answer hashing (#319) (#321)
* [SYNCOPE-1666] added security answer hashing (#321)
---
.../org/apache/syncope/core/logic/UserLogic.java | 33 +++---
.../core/persistence/api/entity/user/Account.java | 6 +-
.../core/persistence/api/entity/user/User.java | 4 +
.../jpa/entity/user/JPALinkedAccount.java | 23 -
.../core/persistence/jpa/entity/user/JPAUser.java | 52 --
.../persistence/jpa/inner/MultitenancyTest.java| 3 +-
.../core/persistence/jpa/inner/UserTest.java | 61 +--
.../core/persistence/jpa/outer/UserTest.java | 3 +-
.../core/provisioning/api/data/UserDataBinder.java | 2 -
.../provisioning/java/DefaultMappingManager.java | 2 +-
.../provisioning/java/data/UserDataBinderImpl.java | 112 +
.../java/propagation/DeletingLinkedAccount.java| 9 +-
.../java/DefaultMappingManagerTest.java| 7 +-
.../core/spring/policy/DefaultPasswordRule.java| 2 +-
.../spring/policy/HaveIBeenPwnedPasswordRule.java | 2 +-
.../syncope/core/logic/UserRequestLogic.java | 2 +-
.../fit/core/reference/TestPasswordRule.java | 2 +-
.../configuration/configurationparameters.adoc | 2 +-
18 files changed, 237 insertions(+), 90 deletions(-)
diff --git
a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
index 29e475d..58e79bd 100644
---
a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
+++
b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
@@ -63,6 +63,7 @@ import
org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
import org.apache.syncope.core.provisioning.api.utils.RealmUtils;
import org.apache.syncope.core.provisioning.java.utils.TemplateUtils;
import org.apache.syncope.core.spring.security.AuthContextUtils;
+import org.apache.syncope.core.spring.security.Encryptor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -124,15 +125,14 @@ public class UserLogic extends AbstractAnyLogic {
return Triple.of(
POJOHelper.serialize(AuthContextUtils.getAuthorizations()),
-
POJOHelper.serialize(delegationDAO.findValidDelegating(authenticatedUser.getKey())),
-binder.returnUserTO(authenticatedUser));
+
POJOHelper.serialize(delegationDAO.findValidDelegating(authenticatedUser.getKey())),
authenticatedUser);
}
@PreAuthorize("hasRole('" + IdRepoEntitlement.USER_READ + "')")
@Transactional(readOnly = true)
@Override
public UserTO read(final String key) {
-return binder.returnUserTO(binder.getUserTO(key));
+return binder.getUserTO(key);
}
@PreAuthorize("hasRole('" + IdRepoEntitlement.USER_SEARCH + "')")
@@ -153,7 +153,7 @@ public class UserLogic extends AbstractAnyLogic {
List matching = searchDAO.search(authRealms, effectiveCond,
page, size, orderBy, AnyTypeKind.USER);
List result = matching.stream().
-map(user -> binder.returnUserTO(binder.getUserTO(user,
details))).
+map(user -> binder.getUserTO(user, details)).
collect(Collectors.toList());
return Pair.of(count, result);
@@ -196,8 +196,7 @@ public class UserLogic extends AbstractAnyLogic {
Pair> created =
provisioningManager.create(
before.getLeft(), nullPriorityAsync,
AuthContextUtils.getUsername(), REST_CONTEXT);
-return afterCreate(
-binder.returnUserTO(binder.getUserTO(created.getKey())),
created.getRight(), before.getRight());
+return afterCreate(binder.getUserTO(created.getKey()),
created.getRight(), before.getRight());
}
@PreAuthorize("isAuthenticated() "
@@ -261,7 +260,7 @@ public class UserLogic extends AbstractAnyLogic {
before.getLeft(), nullPriorityAsync,
AuthContextUtils.getUsername(), REST_CONTEXT);
ProvisioningResult result = afterUpdate(
-
binder.returnUserTO(binder.getUserTO(after.getLeft().getKey())),
+binder.getUserTO(after.getLeft().getKey()),
after.getRight(),
before.getRight());
@@ -315,7 +314,7 @@ public class
[syncope] branch 2_1_X updated: [SYNCOPE-1666] added security answer hashing (#319)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 0084592 [SYNCOPE-1666] added security answer hashing (#319)
0084592 is described below
commit 008459240094e7d021553b484d47aa1569626250
Author: Andrea Patricelli
AuthorDate: Thu Mar 3 17:34:55 2022 +0100
[SYNCOPE-1666] added security answer hashing (#319)
[SYNCOPE-1666] added security answer hashing
---
.../org/apache/syncope/core/logic/UserLogic.java | 31 +++---
.../core/persistence/api/entity/user/Account.java | 6 +-
.../core/persistence/api/entity/user/User.java | 4 +
.../jpa/entity/user/JPALinkedAccount.java | 21 +++-
.../core/persistence/jpa/entity/user/JPAUser.java | 49 +++--
.../persistence/jpa/inner/MultitenancyTest.java| 3 +-
.../core/persistence/jpa/inner/UserTest.java | 61 +--
.../core/persistence/jpa/outer/UserTest.java | 3 +-
.../core/provisioning/api/data/UserDataBinder.java | 2 -
.../core/provisioning/java/MappingManagerImpl.java | 2 +-
.../provisioning/java/data/UserDataBinderImpl.java | 119 +
.../java/propagation/DeletingLinkedAccount.java| 9 +-
.../provisioning/java/MappingManagerImplTest.java | 7 +-
.../core/spring/policy/DefaultPasswordRule.java| 2 +-
.../spring/policy/HaveIBeenPwnedPasswordRule.java | 2 +-
.../syncope/core/logic/UserRequestLogic.java | 2 +-
.../fit/core/reference/TestPasswordRule.java | 2 +-
.../configurationparameters.adoc | 3 +-
18 files changed, 236 insertions(+), 92 deletions(-)
diff --git
a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
index ad59396..dd5ec19 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
@@ -60,6 +60,7 @@ import
org.apache.syncope.core.provisioning.api.data.UserDataBinder;
import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
import org.apache.syncope.core.provisioning.api.utils.RealmUtils;
import org.apache.syncope.core.spring.security.AuthContextUtils;
+import org.apache.syncope.core.spring.security.Encryptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -107,14 +108,14 @@ public class UserLogic extends AbstractAnyLogic {
return Triple.of(
POJOHelper.serialize(AuthContextUtils.getAuthorizations()),
POJOHelper.serialize(delegationDAO.findValidDelegating(authenticatedUser.getKey())),
-binder.returnUserTO(authenticatedUser));
+authenticatedUser);
}
@PreAuthorize("hasRole('" + StandardEntitlement.USER_READ + "')")
@Transactional(readOnly = true)
@Override
public UserTO read(final String key) {
-return binder.returnUserTO(binder.getUserTO(key));
+return binder.getUserTO(key);
}
@PreAuthorize("hasRole('" + StandardEntitlement.USER_SEARCH + "')")
@@ -137,7 +138,7 @@ public class UserLogic extends AbstractAnyLogic {
List matching = searchDAO.search(authRealms, effectiveCond,
page, size, orderBy, AnyTypeKind.USER);
List result = matching.stream().
-map(user -> binder.returnUserTO(binder.getUserTO(user,
details))).
+map(user -> binder.getUserTO(user, details)).
collect(Collectors.toList());
return Pair.of(count, result);
@@ -189,8 +190,7 @@ public class UserLogic extends AbstractAnyLogic {
Pair> created =
provisioningManager.create(before.getLeft(), storePassword,
nullPriorityAsync);
-return afterCreate(
-binder.returnUserTO(binder.getUserTO(created.getKey())),
created.getRight(), before.getRight());
+return afterCreate(binder.getUserTO(created.getKey()),
created.getRight(), before.getRight());
}
@PreAuthorize("isAuthenticated() "
@@ -246,7 +246,7 @@ public class UserLogic extends AbstractAnyLogic {
provisioningManager.update(before.getLeft(),
nullPriorityAsync);
ProvisioningResult result = afterUpdate(
-
binder.returnUserTO(binder.getUserTO(after.getLeft().getKey())),
+binder.getUserTO(after.getLeft().getKey()),
after.getRight(),
before.getRight());
@@ -297,7 +297,7 @@ public class UserLogic extends AbstractAnyLogic {
Pair> updated =
setStatusOnWfAdapter(statusPatch, nullPriorityAsync);
return afte
[syncope] branch master updated: SYNCOPE-1661 added sidebar layout JSON configuration (#314)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 9738f68 SYNCOPE-1661 added sidebar layout JSON configuration (#314)
9738f68 is described below
commit 9738f6822a323f009a9fc24793cf084e1c5756fc
Author: Andrea Patricelli
AuthorDate: Tue Feb 15 09:00:03 2022 +0100
SYNCOPE-1661 added sidebar layout JSON configuration (#314)
---
.../client/enduser/layout/SidebarLayout.java | 57 ++
.../client/enduser/layout/UserFormLayoutInfo.java | 11 +
.../client/enduser/pages/SelfPasswordReset.java| 6 +--
.../syncope/client/enduser/panels/Sidebar.java | 20 ++--
.../src/main/resources/customFormLayout.json | 9 +++-
.../pages/SelfConfirmPasswordReset_it.properties | 3 +-
6 files changed, 94 insertions(+), 12 deletions(-)
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/SidebarLayout.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/SidebarLayout.java
new file mode 100644
index 000..030d994
--- /dev/null
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/SidebarLayout.java
@@ -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.
+ */
+package org.apache.syncope.client.enduser.layout;
+
+import java.io.Serializable;
+
+public class SidebarLayout implements Serializable {
+
+private static final long serialVersionUID = 192032086034617378L;
+
+private boolean editUserEnabled = true;
+
+private boolean passwordManagementEnabled = true;
+
+private boolean securityQuestionManagementEnabled = true;
+
+public boolean isEditUserEnabled() {
+return editUserEnabled;
+}
+
+public void setEditUserEnabled(final boolean editUserEnabled) {
+this.editUserEnabled = editUserEnabled;
+}
+
+public boolean isPasswordManagementEnabled() {
+return passwordManagementEnabled;
+}
+
+public void setPasswordManagementEnabled(final boolean
passwordManagementEnabled) {
+this.passwordManagementEnabled = passwordManagementEnabled;
+}
+
+public boolean isSecurityQuestionManagementEnabled() {
+return securityQuestionManagementEnabled;
+}
+
+public void setSecurityQuestionManagementEnabled(final boolean
securityQuestionManagementEnabled) {
+this.securityQuestionManagementEnabled =
securityQuestionManagementEnabled;
+}
+
+}
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/UserFormLayoutInfo.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/UserFormLayoutInfo.java
index 0c81adc..9a24ac2 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/UserFormLayoutInfo.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/UserFormLayoutInfo.java
@@ -39,6 +39,12 @@ public class UserFormLayoutInfo extends
AbstractAnyFormBaseLayout getWhichPlainAttrs() {
return whichPlainAttrs;
}
@@ -71,4 +77,9 @@ public class UserFormLayoutInfo extends
AbstractAnyFormBaseLayout
[syncope] branch 2_1_X updated: [SYNCOPE-1641] added resources to match to purge propagation tasks API (#304)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new f4b6a50 [SYNCOPE-1641] added resources to match to purge propagation
tasks API (#304)
f4b6a50 is described below
commit f4b6a50c911e48581cca8b9e09f75850a4f5feaf
Author: Andrea Patricelli
AuthorDate: Mon Jan 31 15:22:09 2022 +0100
[SYNCOPE-1641] added resources to match to purge propagation tasks API
(#304)
* [SYNCOPE-1641] added resources to match to purge propagation tasks API
---
.../common/rest/api/service/TaskService.java | 5 -
.../org/apache/syncope/core/logic/TaskLogic.java | 10 --
.../syncope/core/persistence/api/dao/TaskDAO.java | 5 -
.../core/persistence/jpa/dao/JPATaskDAO.java | 13 -
.../core/persistence/jpa/inner/TaskTest.java | 4 ++--
.../src/test/resources/domains/MasterContent.xml | 5 +
.../core/rest/cxf/service/TaskServiceImpl.java | 6 +++---
.../syncope/fit/core/PropagationTaskITCase.java| 22 --
8 files changed, 58 insertions(+), 12 deletions(-)
diff --git
a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index caa1695..dcaa2c7 100644
---
a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++
b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -148,6 +148,7 @@ public interface TaskService extends ExecutableService {
*
* @param since match all executions started afterwards
* @param statuses execution status(es) to match
+ * @param resources external resource(s) to match
* @return deleted propagation tasks
*/
@ApiResponses({
@@ -157,5 +158,7 @@ public interface TaskService extends ExecutableService {
@Path("PROPAGATION/purge")
@Produces({ MediaType.APPLICATION_JSON, RESTHeaders.APPLICATION_YAML,
MediaType.APPLICATION_XML })
Response purgePropagations(
-@QueryParam("since") Date since, @QueryParam("statuses")
List statuses);
+@QueryParam("since") Date since,
+@QueryParam("statuses") List statuses,
+@QueryParam("resources") List resources);
}
diff --git
a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
index 5c51b68..8d25118 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
import javax.ws.rs.core.Response;
import org.apache.commons.lang3.ArrayUtils;
@@ -454,8 +455,13 @@ public class TaskLogic extends
AbstractExecutableLogic {
}
@PreAuthorize("hasRole('" + StandardEntitlement.TASK_DELETE + "')")
-public List purgePropagations(final Date since, final
List statuses) {
-return taskDAO.purgePropagations(since, statuses);
+public List purgePropagations(
+final Date since,
+final List statuses,
+final List resources) {
+return taskDAO.purgePropagations(since, statuses, resources == null
+? null
+:
resources.stream().map(resourceDAO::find).filter(Objects::nonNull).collect(Collectors.toList()));
}
@Override
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/TaskDAO.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/TaskDAO.java
index 7161479..8cd5f73 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/TaskDAO.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/TaskDAO.java
@@ -76,5 +76,8 @@ public interface TaskDAO extends DAO {
void deleteAll(ExternalResource resource, TaskType type);
-List purgePropagations(Date since, List
statuses);
+List purgePropagations(
+Date since,
+List statuses,
+List externalResources);
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
index 6987113..78d97bb 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persiste
[syncope] branch master updated: [SYNCOPE-1656] remediation now is generated also on pull update failure (#303)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 bdeaaf4 [SYNCOPE-1656] remediation now is generated also on pull
update failure (#303)
bdeaaf4 is described below
commit bdeaaf4660a7b9b3fbecf20f41c9db20cca6aed0
Author: Andrea Patricelli
AuthorDate: Mon Jan 17 09:31:32 2022 +0100
[SYNCOPE-1656] remediation now is generated also on pull update failure
(#303)
* [SYNCOPE-1656] remediation now is generated also on pull update failure,
made some refactoring
---
.../java/pushpull/AbstractPullResultHandler.java | 103 +++--
.../pushpull/DefaultUserPullResultHandler.java | 53 +++--
.../org/apache/syncope/fit/AbstractITCase.java | 32 ++
.../apache/syncope/fit/core/PullTaskITCase.java| 123 -
4 files changed, 234 insertions(+), 77 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index ac41367..6c8de99 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.syncope.common.lib.AnyOperations;
import org.apache.syncope.common.lib.request.AnyCR;
@@ -35,10 +36,12 @@ import
org.apache.syncope.common.lib.types.AuditElements.Result;
import org.apache.syncope.common.lib.types.MatchType;
import org.apache.syncope.common.lib.types.MatchingRule;
import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.core.persistence.api.entity.AnyType;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.PullMode;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.UnmatchingRule;
+import org.apache.syncope.core.persistence.api.dao.AnyTypeDAO;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
import org.apache.syncope.core.persistence.api.dao.RemediationDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
@@ -91,6 +94,9 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
protected UserDAO userDAO;
@Autowired
+protected AnyTypeDAO anyTypeDAO;
+
+@Autowired
protected TaskDAO taskDAO;
@Autowired
@@ -254,18 +260,12 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
if (profile.getTask().isRemediation()) {
// set to SUCCESS to let the incremental flow go on in
case of errors
resultStatus = Result.SUCCESS;
-Remediation entity =
entityFactory.newEntity(Remediation.class);
-entity.setAnyType(provision.getAnyType());
-entity.setOperation(ResourceOperation.CREATE);
-entity.setPayload(anyCR);
-entity.setError(result.getMessage());
-entity.setInstant(new Date());
-
entity.setRemoteName(delta.getObject().getName().getNameValue());
-if (taskDAO.find(profile.getTask().getKey()) != null) {
-entity.setPullTask(profile.getTask());
-}
-
-remediationDAO.save(entity);
+createRemediation(
+provision.getAnyType(),
+anyCR,
+taskDAO.find(profile.getTask().getKey()) != null ?
profile.getTask() : null,
+result,
+delta);
} else {
resultStatus = Result.FAILURE;
}
@@ -382,17 +382,7 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
if (profile.getTask().isRemediation()) {
// set to SUCCESS to let the incremental flow go
on in case of errors
resultStatus = Result.SUCCESS;
-
-Remediation entity =
entityFactory.newEntity(Remediation.class);
-entity.setAnyType(provision.getAnyType());
-entity.setOperation(ResourceOperation.UPDATE
[syncope] branch 2_1_X updated: [SYNCOPE-1656] remediation now is generated also on pull update failure (#302)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 111cd77 [SYNCOPE-1656] remediation now is generated also on pull update failure (#302) 111cd77 is described below commit 111cd779dc400ff567e3362e0e982b64354bf3f5 Author: Andrea Patricelli AuthorDate: Fri Jan 14 17:02:28 2022 +0100 [SYNCOPE-1656] remediation now is generated also on pull update failure (#302) * [SYNCOPE-1656] remediation now is generated also on pull update failure, made some refactoring --- .../java/pushpull/AbstractPullResultHandler.java | 127 + .../pushpull/DefaultUserPullResultHandler.java | 56 +++-- .../org/apache/syncope/fit/AbstractITCase.java | 32 ++ .../apache/syncope/fit/core/PullTaskITCase.java| 115 ++- 4 files changed, 243 insertions(+), 87 deletions(-) diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java index 2d84f06..3416c3e 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java @@ -18,57 +18,60 @@ */ package org.apache.syncope.core.provisioning.java.pushpull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.syncope.common.lib.AnyOperations; import org.apache.syncope.common.lib.patch.AnyPatch; import org.apache.syncope.common.lib.patch.StringPatchItem; import org.apache.syncope.common.lib.to.AnyTO; +import org.apache.syncope.common.lib.to.ProvisioningReport; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.AuditElements; import org.apache.syncope.common.lib.types.AuditElements.Result; import org.apache.syncope.common.lib.types.MatchType; import org.apache.syncope.common.lib.types.MatchingRule; import org.apache.syncope.common.lib.types.PatchOperation; -import org.apache.syncope.core.provisioning.api.PropagationByResource; import org.apache.syncope.common.lib.types.PullMode; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.common.lib.types.UnmatchingRule; +import org.apache.syncope.core.persistence.api.dao.AnyTypeDAO; import org.apache.syncope.core.persistence.api.dao.NotFoundException; +import org.apache.syncope.core.persistence.api.dao.PullMatch; import org.apache.syncope.core.persistence.api.dao.RemediationDAO; +import org.apache.syncope.core.persistence.api.dao.TaskDAO; import org.apache.syncope.core.persistence.api.dao.UserDAO; -import org.apache.syncope.core.provisioning.api.propagation.PropagationException; -import org.apache.syncope.core.spring.security.DelegatedAdministrationException; import org.apache.syncope.core.persistence.api.dao.VirSchemaDAO; +import org.apache.syncope.core.persistence.api.entity.AnyType; import org.apache.syncope.core.persistence.api.entity.EntityFactory; import org.apache.syncope.core.persistence.api.entity.Remediation; import org.apache.syncope.core.persistence.api.entity.resource.Provision; import org.apache.syncope.core.persistence.api.entity.task.PullTask; import org.apache.syncope.core.provisioning.api.AuditManager; +import org.apache.syncope.core.provisioning.api.PropagationByResource; import org.apache.syncope.core.provisioning.api.ProvisioningManager; import org.apache.syncope.core.provisioning.api.cache.VirAttrCache; +import org.apache.syncope.core.provisioning.api.cache.VirAttrCacheKey; import org.apache.syncope.core.provisioning.api.cache.VirAttrCacheValue; import org.apache.syncope.core.provisioning.api.notification.NotificationManager; +import org.apache.syncope.core.provisioning.api.propagation.PropagationException; import org.apache.syncope.core.provisioning.api.pushpull.IgnoreProvisionException; -import org.apache.syncope.common.lib.to.ProvisioningReport; import org.apache.syncope.core.provisioning.api.pushpull.PullActions; -import org.apache.syncope.core.persistence.api.dao.PullMatch; -import org.apache.syncope.core.persistence.api.dao.TaskDAO; -import org.apache.syncope.core.provisioning.api.cache.VirAttrCacheKey; import org.apache.syncope.core.provisioning.api.pushpull.SyncopePullExecutor; import org.apache.syncope.core.provisioning.api.pushpull.SyncopePullResultHandler; import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils
[syncope] branch master updated: [SYNCOPE-1646] fixed wrong status value on linked account propagation
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 35cbbde [SYNCOPE-1646] fixed wrong status value on linked account
propagation
35cbbde is described below
commit 35cbbdea358887f04ba301282dab913a7ba4c3a5
Author: Andrea Patricelli
AuthorDate: Wed Oct 20 12:07:04 2021 +0200
[SYNCOPE-1646] fixed wrong status value on linked account propagation
---
.../apache/syncope/core/provisioning/java/DefaultMappingManager.java | 2 +-
.../syncope/core/provisioning/java/DefaultMappingManagerTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
index e489af4..83fe8b0 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
@@ -407,7 +407,7 @@ public class DefaultMappingManager implements
MappingManager {
});
if (account.isSuspended() != null) {
-
attributes.add(AttributeBuilder.buildEnabled(!BooleanUtils.negate(account.isSuspended(;
+
attributes.add(AttributeBuilder.buildEnabled(BooleanUtils.negate(account.isSuspended(;
}
if (!changePwd) {
Attribute pwdAttr =
AttributeUtil.find(OperationalAttributes.PASSWORD_NAME, attributes);
diff --git
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
index 9706dc0..c9363bd 100644
---
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
+++
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
@@ -51,6 +51,7 @@ import
org.identityconnectors.framework.common.objects.AttributeUtil;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.identityconnectors.framework.common.objects.OperationalAttributes;
@Transactional("Master")
public class DefaultMappingManagerTest extends AbstractTest {
@@ -165,6 +166,7 @@ public class DefaultMappingManagerTest extends AbstractTest
{
account.setConnObjectKeyValue("admin");
account.setResource(ldap);
account.setOwner(vivaldi);
+account.setSuspended(Boolean.FALSE);
account.setPassword("Password321", CipherAlgorithm.AES);
vivaldi.add(account);
@@ -180,6 +182,7 @@ public class DefaultMappingManagerTest extends AbstractTest
{
provision);
assertEquals("admin",
AttributeUtil.getStringValue(AttributeUtil.find("cn", attrs)));
assertEquals("Password321",
SecurityUtil.decrypt(AttributeUtil.getPasswordValue(attrs)));
+
assertTrue(AttributeUtil.getBooleanValue(AttributeUtil.find(OperationalAttributes.ENABLE_NAME,
attrs)));
// 2. without account password and clear-text default password
account.setEncodedPassword(null, null);
[syncope] branch master updated: [SYNCOPE-1632] graphical adjustments to must-change-password page
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 d997a52 [SYNCOPE-1632] graphical adjustments to must-change-password
page
d997a52 is described below
commit d997a52e9715437c9a4c0edce269a388c77071cc
Author: Andrea Patricelli
AuthorDate: Fri Sep 17 14:50:56 2021 +0200
[SYNCOPE-1632] graphical adjustments to must-change-password page
---
.../commons/pages/AbstractMustChangePassword.java | 17 +++---
.../META-INF/resources/css/syncopeConsole.scss | 7 +--
.../client/console/pages/MustChangePassword.html | 63 +-
3 files changed, 35 insertions(+), 52 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/AbstractMustChangePassword.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/AbstractMustChangePassword.java
index 3535b03..3cfb56f 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/AbstractMustChangePassword.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/AbstractMustChangePassword.java
@@ -19,7 +19,6 @@
package org.apache.syncope.client.ui.commons.pages;
import org.apache.syncope.client.ui.commons.Constants;
-import
org.apache.syncope.client.ui.commons.markup.html.form.AjaxPasswordFieldPanel;
import org.apache.syncope.client.ui.commons.panels.NotificationPanel;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.wicket.AttributeModifier;
@@ -46,9 +45,9 @@ public abstract class AbstractMustChangePassword extends
WebPage {
protected final TextField usernameField;
-protected final AjaxPasswordFieldPanel passwordField;
+protected final PasswordTextField passwordField;
-protected final AjaxPasswordFieldPanel confirmPasswordField;
+protected final PasswordTextField confirmPasswordField;
protected final NotificationPanel notificationPanel = new
NotificationPanel(Constants.FEEDBACK);
@@ -65,21 +64,19 @@ public abstract class AbstractMustChangePassword extends
WebPage {
usernameField.setEnabled(false);
form.add(usernameField);
-passwordField = new AjaxPasswordFieldPanel("password", "password", new
Model<>());
+passwordField = new PasswordTextField("password", new Model<>());
passwordField.setRequired(true);
passwordField.setMarkupId("password");
-passwordField.setPlaceholder("password");
-((PasswordTextField) passwordField.getField()).setResetPassword(true);
+passwordField.setResetPassword(true);
form.add(passwordField);
-confirmPasswordField = new AjaxPasswordFieldPanel("confirmPassword",
"confirmPassword", new Model<>());
+confirmPasswordField = new PasswordTextField("confirmPassword", new
Model<>());
confirmPasswordField.setRequired(true);
confirmPasswordField.setMarkupId("confirmPassword");
-confirmPasswordField.setPlaceholder("confirmPassword");
-((PasswordTextField)
confirmPasswordField.getField()).setResetPassword(true);
+confirmPasswordField.setResetPassword(true);
form.add(confirmPasswordField);
-form.add(new EqualPasswordInputValidator(passwordField.getField(),
confirmPasswordField.getField()));
+form.add(new EqualPasswordInputValidator(passwordField,
confirmPasswordField));
AjaxButton submitButton = new AjaxButton("submit", new
Model<>(getString("submit"))) {
diff --git
a/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss
b/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss
index c3af8fa..ab5c52d 100644
---
a/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss
+++
b/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss
@@ -80,16 +80,13 @@ body {
}
}
-
-
/* Must Change Password
=
*/
#mcp_wrapper {
- height: 100%;
- #mcp_logo {
-background: $background_console_white;
+ .form-control{
+margin-bottom: 10px
}
.card {
diff --git
a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
index 427fb55..8ad1c4b 100644
---
a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
+++
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
@@ -27,6 +27,7 @@ under the License.
+
@@ -55,43 +56,31 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[syncope] branch 2_1_X updated: [SYNCOPE-1640] fixed removal of empty enumeration key on multivalue p… (#286)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new c8b9cb2 [SYNCOPE-1640] fixed removal of empty enumeration key on
multivalue p… (#286)
c8b9cb2 is described below
commit c8b9cb2a0e5402ad462f1328393cc47475c3c6b8
Author: Andrea Patricelli
AuthorDate: Sat Aug 14 19:59:08 2021 +0200
[SYNCOPE-1640] fixed removal of empty enumeration key on multivalue p…
(#286)
* [SYNCOPE-1640] fixed removal of empty enumeration key on multivalue param
and enum schema definition
---
.../syncope/client/console/commons/PropertyList.java | 16
.../client/console/panels/PlainSchemaDetails.java| 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/commons/PropertyList.java
b/client/console/src/main/java/org/apache/syncope/client/console/commons/PropertyList.java
index eb1e0ab..654c2e6 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/commons/PropertyList.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/commons/PropertyList.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeConstants;
@@ -171,18 +172,9 @@ public abstract class PropertyList implements
List {
}
public static String getEnumValuesAsString(final List
enumerationValues) {
-final StringBuilder builder = new StringBuilder();
-int index = 0;
-for (String str : enumerationValues) {
-if (str != null) {
-if (index > 0) {
-builder.append(SyncopeConstants.ENUM_VALUES_SEPARATOR);
-}
-index++;
-builder.append(str.trim());
-}
-}
-return builder.toString();
+return enumerationValues.stream().
+map(v -> StringUtils.isEmpty(v) ? StringUtils.EMPTY :
v.trim()).
+
collect(Collectors.joining(SyncopeConstants.ENUM_VALUES_SEPARATOR));
}
public static List getEnumValuesAsList(final String
enumerationValues) {
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
index 166f2a4..c2e3d13 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
@@ -176,7 +176,7 @@ public class PlainSchemaDetails extends
AbstractSchemaDetailsPanel {
}.build(
"enumerationKeys",
"enumerationKeys",
-new AjaxTextFieldPanel("panel", "enumerationKeys", new
Model()));
+new AjaxTextFieldPanel("panel", "enumerationKeys", new
Model<>(null)));
WebMarkupContainer enumParams = new WebMarkupContainer("enumParams");
enumParams.setOutputMarkupPlaceholderTag(true);
[syncope] branch master updated: Incremental pull remediation improvements (#283)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 0b545de Incremental pull remediation improvements (#283)
0b545de is described below
commit 0b545de8de3acdd54951354639e4d55da73ac699
Author: Andrea Patricelli
AuthorDate: Tue Jul 27 10:32:45 2021 +0200
Incremental pull remediation improvements (#283)
* do not stop on first error while pulling in incremental mode
---
.../java/pushpull/AbstractPullResultHandler.java| 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index 94cb8af..67d245d 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -250,9 +250,10 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
result.setMessage(ExceptionUtils.getRootCauseMessage(e));
LOG.error("Could not create {} {} ",
provision.getAnyType().getKey(), delta.getUid().getUidValue(), e);
output = e;
-resultStatus = Result.FAILURE;
if (profile.getTask().isRemediation()) {
+// set to SUCCESS to let the incremental flow go on in
case of errors
+resultStatus = Result.SUCCESS;
Remediation entity =
entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.CREATE);
@@ -265,6 +266,8 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
}
remediationDAO.save(entity);
+} else {
+resultStatus = Result.FAILURE;
}
}
@@ -375,9 +378,11 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
LOG.error("Could not update {} {}",
provision.getAnyType().getKey(),
delta.getUid().getUidValue(), e);
output = e;
-resultStatus = Result.FAILURE;
if (profile.getTask().isRemediation()) {
+// set to SUCCESS to let the incremental flow go
on in case of errors
+resultStatus = Result.SUCCESS;
+
Remediation entity =
entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.UPDATE);
@@ -388,6 +393,8 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
entity.setPullTask(profile.getTask());
remediationDAO.save(entity);
+} else {
+resultStatus = Result.FAILURE;
}
}
}
@@ -680,6 +687,8 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
output = e;
if (profile.getTask().isRemediation()) {
+// set to SUCCESS to let the incremental flow go
on in case of errors
+resultStatus = Result.SUCCESS;
Remediation entity =
entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.DELETE);
[syncope] branch 2_1_X updated: Incremental pull remediation improvements (#283)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 5c62e35 Incremental pull remediation improvements (#283)
5c62e35 is described below
commit 5c62e35492cb15e0edeb3c1b100242a476bc8123
Author: Andrea Patricelli
AuthorDate: Tue Jul 27 10:32:45 2021 +0200
Incremental pull remediation improvements (#283)
* do not stop on first error while pulling in incremental mode
---
.../java/pushpull/AbstractPullResultHandler.java| 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index 4021560..2d84f06 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -246,9 +246,10 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
result.setMessage(ExceptionUtils.getRootCauseMessage(e));
LOG.error("Could not create {} {} ", anyTO.getType(),
delta.getUid().getUidValue(), e);
output = e;
-resultStatus = Result.FAILURE;
if (profile.getTask().isRemediation()) {
+// set to SUCCESS to let the incremental flow go on in
case of errors
+resultStatus = Result.SUCCESS;
Remediation entity =
entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.CREATE);
@@ -261,6 +262,8 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
}
remediationDAO.save(entity);
+} else {
+resultStatus = Result.FAILURE;
}
}
@@ -371,9 +374,11 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
LOG.error("Could not update {} {}",
provision.getAnyType().getKey(),
delta.getUid().getUidValue(), e);
output = e;
-resultStatus = Result.FAILURE;
if (profile.getTask().isRemediation()) {
+// set to SUCCESS to let the incremental flow go
on in case of errors
+resultStatus = Result.SUCCESS;
+
Remediation entity =
entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.UPDATE);
@@ -384,6 +389,8 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
entity.setPullTask(profile.getTask());
remediationDAO.save(entity);
+} else {
+resultStatus = Result.FAILURE;
}
}
}
@@ -673,6 +680,8 @@ public abstract class AbstractPullResultHandler extends
AbstractSyncopeResultHan
output = e;
if (profile.getTask().isRemediation()) {
+// set to SUCCESS to let the incremental flow go
on in case of errors
+resultStatus = Result.SUCCESS;
Remediation entity =
entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.DELETE);
[syncope] branch 2_1_X updated: adding parenthesis to perform the correct query while searching by plainAttrValue
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 1d66d86 adding parenthesis to perform the correct query while
searching by plainAttrValue
1d66d86 is described below
commit 1d66d86f2e963799ebde5b099578543e2d02e085
Author: Andrea Patricelli
AuthorDate: Thu Jul 1 16:22:00 2021 +0200
adding parenthesis to perform the correct query while searching by
plainAttrValue
---
.../org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index 1edc88f..8da2119 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -189,7 +189,7 @@ public abstract class AbstractAnyDAO>
extends AbstractDAO im
private Query findByPlainAttrValueQuery(final String entityName, final
boolean ignoreCaseMatch) {
String query = "SELECT e FROM " + entityName + " e"
-+ " WHERE e.attribute.schema.id = :schemaKey AND
(e.stringValue IS NOT NULL"
++ " WHERE e.attribute.schema.id = :schemaKey AND
((e.stringValue IS NOT NULL"
+ " AND "
+ (ignoreCaseMatch ? "LOWER(" : "") + "e.stringValue" +
(ignoreCaseMatch ? ")" : "")
+ " = "
@@ -197,7 +197,7 @@ public abstract class AbstractAnyDAO>
extends AbstractDAO im
+ " OR (e.booleanValue IS NOT NULL AND e.booleanValue =
:booleanValue)"
+ " OR (e.dateValue IS NOT NULL AND e.dateValue = :dateValue)"
+ " OR (e.longValue IS NOT NULL AND e.longValue = :longValue)"
-+ " OR (e.doubleValue IS NOT NULL AND e.doubleValue =
:doubleValue)";
++ " OR (e.doubleValue IS NOT NULL AND e.doubleValue =
:doubleValue))";
return entityManager().createQuery(query);
}
[syncope] branch master updated: adding parenthesis to perform the correct query while searching by plainAttrValue
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 3a4cdb4 adding parenthesis to perform the correct query while
searching by plainAttrValue
3a4cdb4 is described below
commit 3a4cdb46aab775e286e6eca3c4d963c04251188c
Author: Andrea Patricelli
AuthorDate: Thu Jul 1 16:22:00 2021 +0200
adding parenthesis to perform the correct query while searching by
plainAttrValue
---
.../org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index bc529dd..74ba5c1 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -188,7 +188,7 @@ public abstract class AbstractAnyDAO>
extends AbstractDAO im
private Query findByPlainAttrValueQuery(final String entityName, final
boolean ignoreCaseMatch) {
String query = "SELECT e FROM " + entityName + " e"
-+ " WHERE e.attribute.schema.id = :schemaKey AND
(e.stringValue IS NOT NULL"
++ " WHERE e.attribute.schema.id = :schemaKey AND
((e.stringValue IS NOT NULL"
+ " AND "
+ (ignoreCaseMatch ? "LOWER(" : "") + "e.stringValue" +
(ignoreCaseMatch ? ")" : "")
+ " = "
@@ -196,7 +196,7 @@ public abstract class AbstractAnyDAO>
extends AbstractDAO im
+ " OR (e.booleanValue IS NOT NULL AND e.booleanValue =
:booleanValue)"
+ " OR (e.dateValue IS NOT NULL AND e.dateValue = :dateValue)"
+ " OR (e.longValue IS NOT NULL AND e.longValue = :longValue)"
-+ " OR (e.doubleValue IS NOT NULL AND e.doubleValue =
:doubleValue)";
++ " OR (e.doubleValue IS NOT NULL AND e.doubleValue =
:doubleValue))";
return entityManager().createQuery(query);
}
[syncope] branch master updated: creating remediation also from exceptions on pullActions, also fixing… (#269) (#271)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 75bf23a creating remediation also from exceptions on pullActions,
also fixing… (#269) (#271)
75bf23a is described below
commit 75bf23a78c918f6ec27691252c96176bcf215fe1
Author: Andrea Patricelli
AuthorDate: Fri May 28 17:25:00 2021 +0200
creating remediation also from exceptions on pullActions, also fixing…
(#269) (#271)
* enabling remediation creation also from exceptions on pullActions
---
.../client/console/status/ReconTaskPanel.java | 4 ++
.../client/console/status/ReconTaskPanel.html | 1 +
.../console/status/ReconTaskPanel.properties | 24 +
.../console/status/ReconTaskPanel_fr_CA.properties | 24 +
.../console/status/ReconTaskPanel_it.properties| 24 +
.../console/status/ReconTaskPanel_ja.properties| 24 +
.../console/status/ReconTaskPanel_pt_BR.properties | 24 +
.../console/status/ReconTaskPanel_ru.properties} | 15 +-
.../SchedTaskWizardBuilder$Profile_ru.properties | 2 +-
.../syncope/core/logic/ReconciliationLogic.java| 4 ++
.../java/pushpull/AbstractPullResultHandler.java | 27 ++
.../apache/syncope/fit/core/PullTaskITCase.java| 58 ++
12 files changed, 206 insertions(+), 25 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
index f6bce2f..80349b1 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
@@ -114,6 +114,7 @@ public class ReconTaskPanel extends
MultilevelPanel.SecondLevel {
if (taskTO instanceof PushTaskTO) {
form.add(new Label("realm", ""));
+form.add(new Label("remediation", ""));
} else {
boolean isSearchEnabled = RealmsUtils.isSearchEnabled();
AutoCompleteSettings settings = new AutoCompleteSettings();
@@ -147,6 +148,9 @@ public class ReconTaskPanel extends
MultilevelPanel.SecondLevel {
realm.setEnabled(false);
}
form.add(realm);
+
+form.add(new AjaxCheckBoxPanel(
+"remediation", "remediation", new PropertyModel<>(taskTO,
"remediation"), false));
}
AjaxPalettePanel actions = new
AjaxPalettePanel.Builder().
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html
index 8c7a2b0..6e3aabd 100644
---
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html
+++
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.html
@@ -22,6 +22,7 @@ under the License.
[actions]
+ [remediation]
[realm]
[matchingRule]
[unmatchingRule]
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.properties
new file mode 100644
index 000..643ed9a
--- /dev/null
+++
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/status/ReconTaskPanel.properties
@@ -0,0 +1,24 @@
+# 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.
+destinationRealm=Destination realm
+remediation=Remediation
+matchingRule=Matching rule
+unmatchingRule=Unmatching rule
+performCreate=Allow create
+performUpdate=Allow update
+performDelete=Allow delete
+syncStatus=Sync status
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/con
[syncope] branch master updated: removing merge message line
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 624e5b7 removing merge message line 624e5b7 is described below commit 624e5b7327702d1141fe9f6f8c24e647f38ed320 Author: Andrea Patricelli AuthorDate: Thu Apr 29 10:24:41 2021 +0200 removing merge message line --- core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml index 41219a5..47abe2c 100644 --- a/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml +++ b/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml @@ -80,7 +80,6 @@ under the License.
[syncope] branch 2_1_X updated: fixing wrong entitlement on report update console button
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 7c2b7ba fixing wrong entitlement on report update console button 7c2b7ba is described below commit 7c2b7bacd8e23778a14ce590296624345f9ab33d Author: Andrea Patricelli AuthorDate: Mon Jan 18 12:11:13 2021 +0100 fixing wrong entitlement on report update console button --- .../org/apache/syncope/client/console/reports/ReportDirectoryPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java index f6dcda5..c72b163 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java @@ -213,7 +213,7 @@ public abstract class ReportDirectoryPanel "reportlet.conf", ReportDirectoryPanel.this, Model.of(model.getObject(; MetaDataRoleAuthorizationStrategy.authorize( -modal.getForm(), ENABLE, StandardEntitlement.RESOURCE_UPDATE); +modal.getForm(), ENABLE, StandardEntitlement.REPORT_UPDATE); modal.show(true); }
[syncope] branch 2_0_X updated: fixing wrong entitlement on report update console button
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new ff44cb0 fixing wrong entitlement on report update console button ff44cb0 is described below commit ff44cb0b16fde20ba3576ba2bb2d94efdc04fb17 Author: Andrea Patricelli AuthorDate: Mon Jan 18 12:11:13 2021 +0100 fixing wrong entitlement on report update console button --- .../org/apache/syncope/client/console/reports/ReportDirectoryPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java index f4ceed6..6fc8e00 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java @@ -208,7 +208,7 @@ public abstract class ReportDirectoryPanel "reportlet.conf", ReportDirectoryPanel.this, Model.of(model.getObject(; MetaDataRoleAuthorizationStrategy.authorize( -modal.getForm(), ENABLE, StandardEntitlement.RESOURCE_UPDATE); +modal.getForm(), ENABLE, StandardEntitlement.REPORT_UPDATE); modal.show(true); }
[syncope] branch master updated: [SYNCOPE-1597] Parametrized layout in console to enable non role-based customization (#225)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 ca95724 [SYNCOPE-1597] Parametrized layout in console to enable non
role-based customization (#225)
ca95724 is described below
commit ca957247ab62bb881ed7c9ab985cb9eda90f10fb
Author: Andrea Patricelli
AuthorDate: Fri Oct 30 16:33:09 2020 +0100
[SYNCOPE-1597] Parametrized layout in console to enable non role-based
customization (#225)
* [SYNCOPE-1597] Parametrized layout in console to enable non role-based
customization
---
.../org/apache/syncope/client/console/SyncopeWebApplication.java | 9 +
.../java/org/apache/syncope/client/console/layout/AnyLayout.java | 8 ++--
client/idrepo/console/src/main/resources/console.properties | 2 ++
fit/console-reference/src/main/resources/console.properties | 2 ++
fit/core-reference/src/test/resources/console.properties | 2 ++
5 files changed, 21 insertions(+), 2 deletions(-)
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 ef8c8e3..7c30fc7 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
@@ -68,6 +68,7 @@ import
org.apache.syncope.client.console.commons.PolicyTabProvider;
import org.apache.syncope.client.console.commons.StatusProvider;
import org.apache.syncope.client.console.commons.VirSchemaDetailsPanelProvider;
import org.apache.syncope.client.console.pages.MustChangePassword;
+import org.apache.syncope.client.console.panels.AnyPanel;
import org.apache.syncope.client.ui.commons.SyncopeUIRequestCycleListener;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
@@ -142,6 +143,8 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
private PolicyTabProvider policyTabProvider;
private Map> pageClasses;
+
+private String defaultAnyLayoutClass;
@SuppressWarnings("unchecked")
protected void populatePageClasses(final Properties props) {
@@ -229,6 +232,8 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
populatePageClasses(props);
pageClasses = Collections.unmodifiableMap(pageClasses);
+defaultAnyLayoutClass = props.getProperty("default.any.panel.class",
AnyPanel.class.getName());
+
// Application settings
IBootstrapSettings settings = new BootstrapSettings();
@@ -393,6 +398,10 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
return queueCapacity;
}
+public String getDefaultAnyLayoutClass() {
+return defaultAnyLayoutClass;
+}
+
public SyncopeClientFactoryBean newClientFactory() {
return new SyncopeClientFactoryBean().
setAddress(serviceOps.get(NetworkService.Type.CORE).getAddress()).
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
index b15138c..9c00390 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
@@ -24,13 +24,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.syncope.client.console.panels.AnyPanel;
+import org.apache.syncope.client.console.SyncopeWebApplication;
public class AnyLayout implements Serializable {
private static final long serialVersionUID = 488645029994410970L;
-private String anyPanelClass = AnyPanel.class.getName();
+private String anyPanelClass;
@JsonProperty("USER")
private UserFormLayoutInfo user;
@@ -40,6 +40,10 @@ public class AnyLayout implements Serializable {
private final Map anyObjects = new
HashMap<>();
+public AnyLayout() {
+this.anyPanelClass =
SyncopeWebApplication.get().getDefaultAnyLayoutClass();
+}
+
public String getAnyPanelClass() {
return anyPanelClass;
}
diff --git a/client/idrepo/console/src/main/resources/console.properties
b/client/idrepo/console/src/main/resources/console.properties
index 06c08b9..3be739e 100644
--- a/client/idrepo/console/src/main/resources/console.properties
+++ b/client/idrepo/console/src/main/resources/console.pro
[syncope] branch 2_1_X updated: [SYNCOPE-1597] Parametrized console to enable non role-based customization (#224)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new f8d0fee [SYNCOPE-1597] Parametrized console to enable non role-based
customization (#224)
f8d0fee is described below
commit f8d0feec359fb75dca31a0ad88ff521c0e61c3ef
Author: Andrea Patricelli
AuthorDate: Fri Oct 30 14:11:23 2020 +0100
[SYNCOPE-1597] Parametrized console to enable non role-based customization
(#224)
* [SYNCOPE-1597] Parametrized layout in console to enable non role-based
customization
---
.../apache/syncope/client/console/SyncopeConsoleApplication.java | 9 +
.../java/org/apache/syncope/client/console/layout/AnyLayout.java | 8 ++--
client/console/src/main/resources/console.properties | 2 ++
docker/console/src/main/resources/console.properties.template| 2 ++
fit/console-reference/src/main/resources/console.properties | 2 ++
fit/core-reference/src/test/resources/console.properties | 2 ++
6 files changed, 23 insertions(+), 2 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index 214298a..b0e457d 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -44,6 +44,7 @@ import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.pages.Dashboard;
import org.apache.syncope.client.console.pages.MustChangePassword;
import org.apache.syncope.client.console.pages.Login;
+import org.apache.syncope.client.console.panels.AnyPanel;
import org.apache.syncope.client.console.themes.AdminLTE;
import org.apache.syncope.client.lib.AnonymousAuthenticationHandler;
import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
@@ -116,6 +117,8 @@ public class SyncopeConsoleApplication extends
AuthenticatedWebApplication {
private List domains;
private Map> pageClasses;
+
+private String defaultAnyLayoutClass;
@SuppressWarnings("unchecked")
protected void populatePageClasses(final Properties props) {
@@ -187,6 +190,8 @@ public class SyncopeConsoleApplication extends
AuthenticatedWebApplication {
populatePageClasses(props);
pageClasses = Collections.unmodifiableMap(pageClasses);
+defaultAnyLayoutClass = props.getProperty("default.any.panel.class",
AnyPanel.class.getName());
+
// Application settings
IBootstrapSettings settings = new BootstrapSettings();
@@ -325,6 +330,10 @@ public class SyncopeConsoleApplication extends
AuthenticatedWebApplication {
return queueCapacity;
}
+public String getDefaultAnyLayoutClass() {
+return defaultAnyLayoutClass;
+}
+
public SyncopeClientFactoryBean newClientFactory() {
return new SyncopeClientFactoryBean().
setAddress(scheme + "://" + host + ":" + port +
StringUtils.prependIfMissing(rootPath, "/")).
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
b/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
index b15138c..e742f26 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayout.java
@@ -24,13 +24,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.syncope.client.console.panels.AnyPanel;
+import org.apache.syncope.client.console.SyncopeConsoleApplication;
public class AnyLayout implements Serializable {
private static final long serialVersionUID = 488645029994410970L;
-private String anyPanelClass = AnyPanel.class.getName();
+private String anyPanelClass;
@JsonProperty("USER")
private UserFormLayoutInfo user;
@@ -40,6 +40,10 @@ public class AnyLayout implements Serializable {
private final Map anyObjects = new
HashMap<>();
+public AnyLayout() {
+this.anyPanelClass =
SyncopeConsoleApplication.get().getDefaultAnyLayoutClass();
+}
+
public String getAnyPanelClass() {
return anyPanelClass;
}
diff --git a/client/console/src/main/resources/console.properties
b/client/console/src/main/resources/console.properties
index 8353183..5abb761 100644
--- a/client/console/src/main/resources/console.properties
+++ b/client/console/src/main/resources/console.properties
@@ -44,6 +44,8 @@ page.policies
[syncope] branch master updated: closing tag in BinaryPDFPreviewer.html
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 dc4b262 closing tag in BinaryPDFPreviewer.html dc4b262 is described below commit dc4b262653f398ae7e7000db1bfc70e78eaa2a0c Author: Andrea Patricelli AuthorDate: Mon Oct 12 12:07:45 2020 +0200 closing tag in BinaryPDFPreviewer.html --- .../console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html | 1 + 1 file changed, 1 insertion(+) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html index a0b8619..1eb231f 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html @@ -30,4 +30,5 @@ under the License. +
[syncope] branch 2_1_X updated: closing tag in BinaryPDFPreviewer.html
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 165924e closing tag in BinaryPDFPreviewer.html 165924e is described below commit 165924e5e911b65c9718acf2aae3a7655c3362b9 Author: Andrea Patricelli AuthorDate: Mon Oct 12 11:57:06 2020 +0200 closing tag in BinaryPDFPreviewer.html --- .../console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html | 1 + 1 file changed, 1 insertion(+) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html index b9a1f19..cc30fae 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html @@ -30,4 +30,5 @@ under the License. +
[syncope] branch 2_0_X updated: closing tag in BinaryPDFPreviewer.html
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new d7bbc89 closing tag in BinaryPDFPreviewer.html d7bbc89 is described below commit d7bbc89848bf57d9f3df7b50182fed118463a93a Author: Andrea Patricelli AuthorDate: Mon Oct 12 11:57:06 2020 +0200 closing tag in BinaryPDFPreviewer.html --- .../console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html | 1 + 1 file changed, 1 insertion(+) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html index b9a1f19..cc30fae 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.html @@ -30,4 +30,5 @@ under the License. +
[syncope] branch master updated: adding missing property in console
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 765722c adding missing property in console
765722c is described below
commit 765722cbb7cd868cd07331c43e70d5409a0df591
Author: Andrea Patricelli
AuthorDate: Mon Sep 21 11:57:59 2020 +0200
adding missing property in console
---
.../syncope/client/console/panels/GroupDirectoryPanel_fr_CA.properties | 1 +
1 file changed, 1 insertion(+)
diff --git
a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_fr_CA.properties
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_fr_CA.properties
index 80e16c5..4816c10 100644
---
a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_fr_CA.properties
+++
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_fr_CA.properties
@@ -16,3 +16,4 @@
# under the License.
any.edit=Modifier ${anyTO.type} ${anyTO.name}
group.members=${right} membres de ${left.name}
+auditHistory.title=${anyTO.type} ${anyTO.fullGroupName != "-" ?
anyTO.fullGroupName : anyTO.name} histoire
\ No newline at end of file
[syncope] branch 2_1_X updated: [SYNCOPE-1549] whitelisted javascript in href attributes
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new feacc1a [SYNCOPE-1549] whitelisted javascript in href attributes
feacc1a is described below
commit feacc1a2b3e31b13bf53be0d6886a36cd6e762bd
Author: Andrea Patricelli
AuthorDate: Mon Aug 24 15:03:18 2020 +0200
[SYNCOPE-1549] whitelisted javascript in href attributes
---
.../enduser/src/main/resources/META-INF/resources/app/js/app.js | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index c2f9d9f..3bb3c88 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -46,8 +46,10 @@ var app = angular.module('SyncopeEnduserApp', [
'ngAria'
]);
-app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider',
+ '$translatePartialLoaderProvider', '$compileProvider',
+ function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider,
+ $translatePartialLoaderProvider, $compileProvider) {
/*
|--
| Syncope Enduser AngularJS providers configuration
@@ -315,6 +317,8 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
}
};
});
+// SYNCOPE-1549
+$compileProvider.aHrefSanitizationWhitelist(/^\s*(javascript):/);
}]);
app.run(['$rootScope', '$state', 'AuthService', '$transitions',
function ($rootScope, $state, AuthService, $transitions) {
[syncope] branch 2_0_X updated: [SYNCOPE-1549] whitelisted javascript in href attributes
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 713ae29 [SYNCOPE-1549] whitelisted javascript in href attributes
713ae29 is described below
commit 713ae29ab80da5fed27f66cfaed3b5526edd155b
Author: Andrea Patricelli
AuthorDate: Mon Aug 24 15:03:18 2020 +0200
[SYNCOPE-1549] whitelisted javascript in href attributes
---
.../enduser/src/main/resources/META-INF/resources/app/js/app.js | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 1553a55..53e3008 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -46,8 +46,10 @@ var app = angular.module('SyncopeEnduserApp', [
'ngAria'
]);
-app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider',
+ '$translatePartialLoaderProvider', '$compileProvider',
+ function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider,
+ $translatePartialLoaderProvider, $compileProvider) {
/*
|--
| Syncope Enduser AngularJS providers configuration
@@ -304,6 +306,8 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
}
};
});
+// SYNCOPE-1549
+$compileProvider.aHrefSanitizationWhitelist(/^\s*(javascript):/);
}]);
app.run(['$rootScope', '$state', 'AuthService', '$transitions',
function ($rootScope, $state, AuthService, $transitions) {
[syncope] branch master updated: fixed query on console rest client to retrieve form for a given user
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 9ba9524 fixed query on console rest client to retrieve form for a
given user
9ba9524 is described below
commit 9ba9524bb45e527da91d074d1d9209797f292009
Author: Andrea Patricelli
AuthorDate: Fri Jul 3 14:13:57 2020 +0200
fixed query on console rest client to retrieve form for a given user
---
.../org/apache/syncope/client/console/rest/UserRequestRestClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
index 41a72bb..03cf6c9 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
@@ -62,7 +62,7 @@ public class UserRequestRestClient extends BaseRestClient {
public static Optional getForm(final String userKey) {
PagedResult forms =
getService(UserRequestService.class).
-getForms(new
UserRequestFormQuery.Builder().user(userKey).page(1).size(0).build());
+getForms(new
UserRequestFormQuery.Builder().user(userKey).page(1).size(1).build());
UserRequestForm form = forms.getResult().isEmpty()
? null
: forms.getResult().get(0);
[syncope] branch 2_1_X updated: fixed query on console rest client to retrieve form for a given user
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 97d04b4 fixed query on console rest client to retrieve form for a
given user
97d04b4 is described below
commit 97d04b46fb2c102191ef197c0d5125bc8490e44a
Author: Andrea Patricelli
AuthorDate: Fri Jul 3 14:13:57 2020 +0200
fixed query on console rest client to retrieve form for a given user
---
.../org/apache/syncope/client/console/rest/UserRequestRestClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
index 49e0aa0..39c45c5 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
@@ -62,7 +62,7 @@ public class UserRequestRestClient extends BaseRestClient {
public Optional getForm(final String userKey) {
PagedResult forms =
getService(UserRequestService.class).
-getForms(new
UserRequestFormQuery.Builder().user(userKey).page(1).size(0).build());
+getForms(new
UserRequestFormQuery.Builder().user(userKey).page(1).size(1).build());
UserRequestForm form = forms.getResult().isEmpty()
? null
: forms.getResult().get(0);
[syncope] branch master updated: improving transaction interceptor to preserve already marked transactions (#198)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 8ccfb1e improving transaction interceptor to preserve already marked
transactions (#198)
8ccfb1e is described below
commit 8ccfb1e558c54d524865bc9aeb332ecb28f694f0
Author: Andrea Patricelli
AuthorDate: Tue Jun 16 15:00:23 2020 +0200
improving transaction interceptor to preserve already marked transactions
(#198)
---
.../persistence/jpa/spring/DomainTransactionAnnotationParser.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
index 3dfb385..104ddc4 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
@@ -32,7 +32,9 @@ public class DomainTransactionAnnotationParser extends
SpringTransactionAnnotati
protected TransactionAttribute parseTransactionAnnotation(final
AnnotationAttributes attributes) {
RuleBasedTransactionAttribute rbta =
(RuleBasedTransactionAttribute)
super.parseTransactionAnnotation(attributes);
-rbta.setQualifier(AuthContextUtils.getDomain());
+if (rbta.getQualifier() == null) {
+rbta.setQualifier(AuthContextUtils.getDomain());
+}
return rbta;
}
}
[syncope] branch 2_1_X updated: improving transaction interceptor to preserve already marked transactions (#198)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 57b05f8 improving transaction interceptor to preserve already marked
transactions (#198)
57b05f8 is described below
commit 57b05f85b17a4b9c248d4bc635e26815c2b6d140
Author: Andrea Patricelli
AuthorDate: Tue Jun 16 15:00:23 2020 +0200
improving transaction interceptor to preserve already marked transactions
(#198)
---
.../core/persistence/jpa/spring/DomainTransactionInterceptor.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
index 7d8883a..01bfcf9 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
@@ -47,7 +47,10 @@ public class DomainTransactionInterceptor extends
TransactionInterceptor {
TransactionAttribute txAttr =
origTxAttrSource.getTransactionAttribute(method, targetClass);
if (txAttr instanceof DefaultTransactionAttribute) {
-((DefaultTransactionAttribute)
txAttr).setQualifier(AuthContextUtils.getDomain());
+DefaultTransactionAttribute dta =
(DefaultTransactionAttribute) txAttr;
+if (dta.getQualifier() == null) {
+dta.setQualifier(AuthContextUtils.getDomain());
+}
}
return txAttr;
[syncope] branch 2_0_X updated: improving transaction interceptor to preserve already marked transact… (#198)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 9156491 improving transaction interceptor to preserve already marked
transact… (#198)
9156491 is described below
commit 9156491ccef764155d44ed85a9bc57eb95e0f509
Author: Andrea Patricelli
AuthorDate: Tue Jun 16 15:00:23 2020 +0200
improving transaction interceptor to preserve already marked transact…
(#198)
* improving transaction interceptor to preserve already marked transactions
* restored type check in transaction interceptor
---
.../core/persistence/jpa/spring/DomainTransactionInterceptor.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
index 691f5e4..7cb264c 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
@@ -50,7 +50,10 @@ public class DomainTransactionInterceptor extends
TransactionInterceptor {
TransactionAttribute txAttr =
origTxAttrSource.getTransactionAttribute(method, targetClass);
if (txAttr instanceof DefaultTransactionAttribute) {
-((DefaultTransactionAttribute)
txAttr).setQualifier(AuthContextUtils.getDomain());
+DefaultTransactionAttribute dta =
(DefaultTransactionAttribute) txAttr;
+if (dta.getQualifier() == null) {
+dta.setQualifier(AuthContextUtils.getDomain());
+}
}
return txAttr;
[syncope] branch master updated: [SYNCOPE-1563] Fixed password mangement in user approval form (#188)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 edae2ad [SYNCOPE-1563] Fixed password mangement in user approval form
(#188)
edae2ad is described below
commit edae2ad4de71fe5570f46abc089af34ef824a8b3
Author: Andrea Patricelli
AuthorDate: Fri May 15 14:18:41 2020 +0200
[SYNCOPE-1563] Fixed password mangement in user approval form (#188)
* [SYNCOPE-1563] Do not initialize user approval form with the password
taken from workflow
---
.../syncope/client/console/panels/UserRequestFormDirectoryPanel.java | 4
1 file changed, 4 insertions(+)
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
index 7fe3323..52956d2 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
@@ -227,6 +227,10 @@ public class UserRequestFormDirectoryPanel
UserTO previousUserTO;
if (formTO.getUserUR() == null) {
newUserTO = formTO.getUserTO();
+if (newUserTO != null) {
+// SYNCOPE-1563 do not use the password into
formTO.getUserTO()
+newUserTO.setPassword(null);
+}
previousUserTO = null;
} else if (formTO.getUserTO() == null) {
// make it stronger by handling possible NPE
[syncope] branch 2_1_X updated: [SYNCOPE-1563] Fixed password mangement in user approval form (#188)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 6b7d561 [SYNCOPE-1563] Fixed password mangement in user approval form
(#188)
6b7d561 is described below
commit 6b7d561bf546cccd8b0259a1c8f108f295ad
Author: Andrea Patricelli
AuthorDate: Fri May 15 14:18:41 2020 +0200
[SYNCOPE-1563] Fixed password mangement in user approval form (#188)
* [SYNCOPE-1563] Do not initialize user approval form with the password
taken from workflow
---
.../syncope/client/console/panels/UserRequestFormDirectoryPanel.java | 4
1 file changed, 4 insertions(+)
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
index 37a7150..3a39b7d 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
@@ -228,6 +228,10 @@ public class UserRequestFormDirectoryPanel
UserTO previousUserTO;
if (formTO.getUserPatch() == null) {
newUserTO = formTO.getUserTO();
+if (newUserTO != null) {
+// SYNCOPE-1563 do not use the password into
formTO.getUserTO()
+newUserTO.setPassword(null);
+}
previousUserTO = null;
} else if (formTO.getUserTO() == null) {
// make it stronger by handling possible NPE
[syncope] branch 2_1_X updated (1b13596 -> 1191583)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from 1b13596 Fix CSS palette scrollbar new c36254d [SYNCOPE-1500] init destionation realm for reconciliation and pull tasks new 1191583 removed final The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../client/console/panels/ConnObjectListViewPanel.java| 10 +++--- .../org/apache/syncope/client/console/panels/ConnObjects.java | 5 - .../apache/syncope/client/console/status/ReconTaskPanel.java | 11 +++ .../syncope/client/console/tasks/SchedTaskDirectoryPanel.java | 2 +- .../syncope/client/console/tasks/SchedTaskWizardBuilder.java | 6 ++ .../java/org/apache/syncope/common/lib/to/ReconStatus.java| 11 +++ .../org/apache/syncope/core/logic/ReconciliationLogic.java| 3 +++ 7 files changed, 39 insertions(+), 9 deletions(-)
[syncope] 02/02: removed final
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 119158303a83e13601c5aeb1066a31d444d1f53d
Author: Andrea Patricelli
AuthorDate: Wed Apr 15 17:20:27 2020 +0200
removed final
---
.../apache/syncope/client/console/panels/ConnObjectListViewPanel.java | 2 +-
.../main/java/org/apache/syncope/client/console/panels/ConnObjects.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
index 50d16af..5f5806c 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
@@ -218,7 +218,7 @@ public abstract class ConnObjectListViewPanel extends Panel
{
@Override
public void onClick(final AjaxRequestTarget target, final
ConnObjectTO modelObject) {
String connObjectKeyValue =
modelObject.getAttr(ConnIdSpecialName.UID).get().getValues().get(0);
-final ReconStatus status = reconRestClient.status(
+ReconStatus status = reconRestClient.status(
new ReconQuery.Builder(anyType, resource.getKey())
.connObjectKeyValue(connObjectKeyValue)
.build());
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
index dee47d4..0eef8e1 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
@@ -137,7 +137,7 @@ public class ConnObjects extends Panel implements
ModalPanel {
anyTypes.setEnabled(false);
target.add(anyTypes);
-final PullTaskTO pullTaskTO = new PullTaskTO();
+PullTaskTO pullTaskTO = new PullTaskTO();
pullTaskTO.setDestinationRealm(realm);
connObjects.next("PULL " + resource,
new ReconTaskPanel(
[syncope] 01/02: [SYNCOPE-1500] init destionation realm for reconciliation and pull tasks
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit c36254d434437139fd17e51342596c2d5a7a6702
Author: Andrea Patricelli
AuthorDate: Wed Apr 15 17:02:38 2020 +0200
[SYNCOPE-1500] init destionation realm for reconciliation and pull tasks
---
.../client/console/panels/ConnObjectListViewPanel.java| 10 +++---
.../org/apache/syncope/client/console/panels/ConnObjects.java | 5 -
.../apache/syncope/client/console/status/ReconTaskPanel.java | 11 +++
.../syncope/client/console/tasks/SchedTaskDirectoryPanel.java | 2 +-
.../syncope/client/console/tasks/SchedTaskWizardBuilder.java | 6 ++
.../java/org/apache/syncope/common/lib/to/ReconStatus.java| 11 +++
.../org/apache/syncope/core/logic/ReconciliationLogic.java| 3 +++
7 files changed, 39 insertions(+), 9 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
index 2c97aa6..50d16af 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
@@ -218,15 +218,18 @@ public abstract class ConnObjectListViewPanel extends
Panel {
@Override
public void onClick(final AjaxRequestTarget target, final
ConnObjectTO modelObject) {
String connObjectKeyValue =
modelObject.getAttr(ConnIdSpecialName.UID).get().getValues().get(0);
-String anyKey = reconRestClient.status(new
ReconQuery.Builder(anyType, resource.getKey()).
-
connObjectKeyValue(connObjectKeyValue).build()).getAnyKey();
+final ReconStatus status = reconRestClient.status(
+new ReconQuery.Builder(anyType, resource.getKey())
+.connObjectKeyValue(connObjectKeyValue)
+.build());
pullConnObject(
connObjectKeyValue,
target,
resource.getKey(),
anyType,
-StringUtils.isNotBlank(anyKey),
+status.getRealm(),
+StringUtils.isNotBlank(status.getAnyKey()),
pageRef);
}
}, ActionLink.ActionType.RECONCILIATION_PULL,
StandardEntitlement.TASK_EXECUTE);
@@ -277,6 +280,7 @@ public abstract class ConnObjectListViewPanel extends Panel
{
AjaxRequestTarget target,
String resource,
String anyType,
+String realm,
boolean isOnSyncope,
PageReference pageRef);
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
index 2ccbd7a..dee47d4 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
@@ -131,15 +131,18 @@ public class ConnObjects extends Panel implements
ModalPanel {
final AjaxRequestTarget target,
final String resource,
final String anyType,
+final String realm,
final boolean isOnSyncope,
final PageReference pageRef) {
anyTypes.setEnabled(false);
target.add(anyTypes);
+final PullTaskTO pullTaskTO = new PullTaskTO();
+pullTaskTO.setDestinationRealm(realm);
connObjects.next("PULL " + resource,
new ReconTaskPanel(
resource,
-new PullTaskTO(),
+pullTaskTO,
anyType,
null,
connObjectKeyValue,
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
index afb5203..980315b 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
@@ -24,6 +24,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtil
[syncope] branch 2_0_X updated: fixed typo
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new 65aef50 fixed typo 65aef50 is described below commit 65aef503d07344c33c7371a9f013d2ee5e2145c2 Author: Andrea Patricelli AuthorDate: Mon Mar 30 10:33:07 2020 +0200 fixed typo --- .../syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties index 5341c88..b62b48d 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties @@ -18,7 +18,7 @@ name=Nome description=Descrizione destinationRealm=Realm di destinazione jobDelegateClassName=JobJob Delegate -lastExec=Ultima esecuszione +lastExec=Ultima esecuzione nextExec=Prossima esecuzione active=Attivo
[syncope] branch master updated: fixed typo
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 9391fcb fixed typo 9391fcb is described below commit 9391fcb75a482791bd745cea7239d015257a2509 Author: Andrea Patricelli AuthorDate: Mon Mar 30 10:32:05 2020 +0200 fixed typo --- .../syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties index 960b17a..c9183f5 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties @@ -18,7 +18,7 @@ name=Nome description=Descrizione destinationRealm=Realm di destinazione jobDelegate=JobJob Delegate -lastExec=Ultima esecuszione +lastExec=Ultima esecuzione nextExec=Prossima esecuzione active=Attivo
[syncope] branch 2_1_X updated: fixed typo
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new a016663 fixed typo a016663 is described below commit a016663d1911b5dc5d66f50d2720b28515c167ba Author: Andrea Patricelli AuthorDate: Mon Mar 30 08:42:04 2020 +0200 fixed typo --- .../syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties index 960b17a..c9183f5 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties @@ -18,7 +18,7 @@ name=Nome description=Descrizione destinationRealm=Realm di destinazione jobDelegate=JobJob Delegate -lastExec=Ultima esecuszione +lastExec=Ultima esecuzione nextExec=Prossima esecuzione active=Attivo
[syncope] branch master updated: [SYNCOPE-1542] completed fix on search after hitting enter button
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 5ff0172 [SYNCOPE-1542] completed fix on search after hitting enter
button
5ff0172 is described below
commit 5ff01723c59a429dd7c761138505dd312e08cb58
Author: Andrea Patricelli
AuthorDate: Mon Mar 23 16:07:19 2020 +0100
[SYNCOPE-1542] completed fix on search after hitting enter button
---
.../apache/syncope/client/console/panels/search/SearchClausePanel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
index 8f1bc6b..90142a8 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
@@ -490,7 +490,7 @@ public class SearchClausePanel extends
FieldPanel {
field.add(comparator);
AjaxTextFieldPanel value = new AjaxTextFieldPanel(
-"value", "value", new PropertyModel<>(searchClause, "value"),
false);
+"value", "value", new PropertyModel<>(searchClause, "value"),
true);
value.hideLabel().setOutputMarkupId(true);
field.add(value);
[syncope] branch 2_1_X updated: [SYNCOPE-1542] completed fix on search after hitting enter button
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new c688458 [SYNCOPE-1542] completed fix on search after hitting enter
button
c688458 is described below
commit c688458d2d3b99dd3432cc9e6750e3d83ffceb59
Author: Andrea Patricelli
AuthorDate: Mon Mar 23 15:49:10 2020 +0100
[SYNCOPE-1542] completed fix on search after hitting enter button
---
.../apache/syncope/client/console/panels/search/SearchClausePanel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
index 0acd0fc..1e7acfc 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
@@ -492,7 +492,7 @@ public class SearchClausePanel extends
FieldPanel {
field.add(comparator);
AjaxTextFieldPanel value = new AjaxTextFieldPanel(
-"value", "value", new PropertyModel<>(searchClause, "value"),
false);
+"value", "value", new PropertyModel<>(searchClause, "value"),
true);
value.hideLabel().setOutputMarkupId(true);
field.add(value);
[syncope] branch 2_0_X updated (f795b97 -> e13985b)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a change to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from f795b97 Upgrading Tika add e13985b improved group search in enduser now the filter is really a filter No new revisions were added by this update. Summary of changes: .../resources/META-INF/resources/app/index.html| 2 - .../resources/app/js/filters/propsFilter.js| 52 -- .../META-INF/resources/app/views/groups.html | 2 +- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 client/enduser/src/main/resources/META-INF/resources/app/js/filters/propsFilter.js
[syncope] branch 2_1_X updated: improved group search in enduser now the filter is really a filter
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new cb31787 improved group search in enduser now the filter is really a
filter
cb31787 is described below
commit cb31787159260636184f608d59d661c0d82bef57
Author: Andrea Patricelli
AuthorDate: Fri Mar 20 16:11:30 2020 +0100
improved group search in enduser now the filter is really a filter
---
.../resources/META-INF/resources/app/index.html| 2 -
.../resources/app/js/filters/propsFilter.js| 52 --
.../META-INF/resources/app/views/groups.html | 2 +-
3 files changed, 1 insertion(+), 55 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 7f124f5..486d6ca 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -161,8 +161,6 @@ under the License.
-
-
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/filters/propsFilter.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/filters/propsFilter.js
deleted file mode 100644
index 51e0159..000
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/filters/propsFilter.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * This filter has been defined in order to have a workaround for this bug:
- * https://github.com/angular-ui/ui-select/issues/665
- *
- * When the bug is fixed, we can remove it.
- */
-
-'use strict'
-
-angular.module("self")
-.filter('propsFilter', function () {
- return function (items, props) {
-var out = [];
-if (items && items.length && props.selected &&
props.selected.length) {
- var selected = props.selected;
- for (var i = 0; i < items.length; i++) {
-var item = items[i], itemMisses = true;
-for (var j = 0; j < selected.length; j++) {
- if (item.groupKey == selected[j].groupKey) {
-itemMisses = false;
-break;
- }
-}
-if (itemMisses) {
- out.push(item);
-}
- }
-} else {
- out = items;
-}
-return out;
- };
-});
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
index 0d23a54..70c1c2b 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
@@ -24,7 +24,7 @@ under the License.
{{$item.groupName}}
-
[syncope] branch 2_1_X updated (7071404 -> 0923700)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from 7071404 Fixing after PullActions changes add 0923700 restored correct logic to clear all attributes from customization No new revisions were added by this update. Summary of changes: .../syncope/client/enduser/resources/UserSelfReadResource.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[syncope] branch 2_0_X updated: enduser, please do not check against default values if there isn't any
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 7795abb enduser, please do not check against default values if there
isn't any
7795abb is described below
commit 7795abb095e827b172c4b6b6330960ab7cf0c151
Author: Andrea Patricelli
AuthorDate: Tue Dec 24 17:53:57 2019 +0100
enduser, please do not check against default values if there isn't any
---
.../main/java/org/apache/syncope/client/enduser/util/Validation.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
index 34abf65..a0e9c19 100644
---
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
+++
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
@@ -91,7 +91,7 @@ public final class Validation {
}
private static boolean isValid(final AttrTO attrTO, final CustomAttribute
customAttribute) {
-return customAttribute.isReadonly()
+return customAttribute.isReadonly() &&
!customAttribute.getDefaultValues().isEmpty()
? IterableUtils.matchesAll(attrTO.getValues(), new
Predicate() {
@Override
[syncope] branch 2_1_X updated: enduser, please do not check against default values if there isn't any
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 778eda5 enduser, please do not check against default values if there
isn't any
778eda5 is described below
commit 778eda5c981f3c0ae1c35fc75b806673a254c433
Author: Andrea Patricelli
AuthorDate: Tue Dec 24 17:50:02 2019 +0100
enduser, please do not check against default values if there isn't any
---
.../main/java/org/apache/syncope/client/enduser/util/Validation.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
index 4924a53..1f50646 100644
---
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
+++
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/Validation.java
@@ -85,7 +85,7 @@ public final class Validation {
}
private static boolean isValid(final AttrTO attrTO, final CustomAttribute
customAttribute) {
-return customAttribute.isReadonly()
+return customAttribute.isReadonly() &&
!customAttribute.getDefaultValues().isEmpty()
? attrTO.getValues().stream().allMatch(value ->
customAttribute.getDefaultValues().contains(value))
: true;
}
[syncope] branch 2_0_X updated: [SYNCOPE-1524] use instead of to redirect to social registration, also for OIDC
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 1f16f57 [SYNCOPE-1524] use instead of to redirect to social
registration, also for OIDC
1f16f57 is described below
commit 1f16f57ffce185724c29808e06128c4a561b40ea
Author: Andrea Patricelli
AuthorDate: Thu Dec 12 09:33:58 2019 +0100
[SYNCOPE-1524] use instead of to redirect to social registration, also
for OIDC
---
.../META-INF/resources/app/js/controllers/OIDCClientController.js| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/OIDCClientController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/OIDCClientController.js
index 8d7b3cd..0ce63b1 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/OIDCClientController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/OIDCClientController.js
@@ -18,9 +18,10 @@
*/
'use strict';
-angular.module("login").controller("OIDCClientController", function ($scope,
$rootScope, $state, userAttrs) {
+angular.module("login").controller("OIDCClientController", function ($scope,
$rootScope, $location, userAttrs) {
$scope.selfCreate = function () {
-$state.go("create" + $rootScope.getWizardFirstStep());
+// use $location instead of $state because Angular routes may not have
been initialized, yet
+$location.path("/self/create" +
$rootScope.getWizardFirstStep().replace('.', '/'));
};
$rootScope.oidcops.userAttrs = userAttrs;
[syncope] branch 2_0_X updated: [SYNCOPE-1524] use instead of to redirect to social registration
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new d165f45 [SYNCOPE-1524] use instead of to redirect to social
registration
d165f45 is described below
commit d165f458e0c9116d15a2a0f56dd14b60532c242d
Author: Andrea Patricelli
AuthorDate: Thu Dec 12 09:24:57 2019 +0100
[SYNCOPE-1524] use instead of to redirect to social registration
---
.../META-INF/resources/app/js/controllers/SAML2SPController.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
index 6d6bd33..ef8cfeb 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
@@ -18,9 +18,10 @@
*/
'use strict';
-angular.module("login").controller("SAML2SPController", function ($scope,
$rootScope, $state, userAttrs) {
+angular.module("login").controller("SAML2SPController", function ($scope,
$rootScope, $location, userAttrs) {
$scope.selfCreate = function () {
-$state.go("create" + $rootScope.getWizardFirstStep());
+// use $location instead of $state because Angular routes may not have
been initialized, yet
+$location.path("/self/create" +
$rootScope.getWizardFirstStep().replace('.', '/'));
};
$rootScope.saml2idps.userAttrs = userAttrs;
[syncope] branch 2_1_X updated: [SYNCOPE-1524] use instead of to redirect to social registration
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 61e4da7 [SYNCOPE-1524] use instead of to redirect to social
registration
61e4da7 is described below
commit 61e4da7eff4573bffad1dc4433951b3140933ff2
Author: Andrea Patricelli
AuthorDate: Thu Dec 12 09:24:57 2019 +0100
[SYNCOPE-1524] use instead of to redirect to social registration
---
.../META-INF/resources/app/js/controllers/SAML2SPController.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
index 6d6bd33..ef8cfeb 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/SAML2SPController.js
@@ -18,9 +18,10 @@
*/
'use strict';
-angular.module("login").controller("SAML2SPController", function ($scope,
$rootScope, $state, userAttrs) {
+angular.module("login").controller("SAML2SPController", function ($scope,
$rootScope, $location, userAttrs) {
$scope.selfCreate = function () {
-$state.go("create" + $rootScope.getWizardFirstStep());
+// use $location instead of $state because Angular routes may not have
been initialized, yet
+$location.path("/self/create" +
$rootScope.getWizardFirstStep().replace('.', '/'));
};
$rootScope.saml2idps.userAttrs = userAttrs;
[syncope] branch 2_1_X updated: improved pull correlation rule generation in core upgrader
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 7e22e67 improved pull correlation rule generation in core upgrader
7e22e67 is described below
commit 7e22e67b573cd51b3567b2644150c95c837127a9
Author: Andrea Patricelli
AuthorDate: Tue Dec 3 09:07:51 2019 +0100
improved pull correlation rule generation in core upgrader
---
.../syncope/core/upgrade/GenerateUpgradeSQL.java | 23 +-
.../core/upgrade/GeneratedUpgradeSQLTest.java | 2 +-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
index 014b6ca..e2fe35d 100644
---
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
+++
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
@@ -119,16 +119,21 @@ public final class GenerateUpgradeSQL {
if (specification.has("correlationRules")) {
specification.get("correlationRules").fields().forEachRemaining(entry -> {
ObjectNode body = MAPPER.createObjectNode();
-if
((entry.getValue().asText().contains("org.apache.syncope"))) {
-final String confClassName =
entry.getValue().asText() + "Conf";
-body.put("@class", confClassName);
-body.put("name", confClassName);
-} else {
-body.put("@class",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
-body.put("name",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
-body.set("schemas", entry.getValue());
-}
try {
+final String pullRuleClass =
entry.getValue().asText();
+if
((pullRuleClass.contains("org.apache.syncope"))) {
+final String confClassName =
"org.apache.syncope.common.lib.policy."
++
pullRuleClass.substring(pullRuleClass.lastIndexOf(".")).replace(".", "")
++ "Conf";
+body.put("@class", confClassName);
+body.put("name", confClassName);
+} else {
+body.
+put("@class",
+
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
+body.put("name",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
+body.set("schemas", entry.getValue());
+}
String implementationId = "PullCorrelationRule_" +
entry.getKey() + "_" + id;
OUT.write("INSERT INTO
Implementation(id,type,engine,body) VALUES("
+ "'" + implementationId + "',"
diff --git
a/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
b/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
index af16116..ecf87d6 100644
---
a/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
+++
b/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
@@ -60,7 +60,7 @@ public class GeneratedUpgradeSQLTest {
@Autowired
private DataSource syncope20DataSource;
-private static final String TEST_PULL_RULE =
"org.apache.syncope.fit.core.reference.TestPullRuleConf";
+private static final String TEST_PULL_RULE =
"org.apache.syncope.common.lib.policy.TestPullRuleConf";
@Test
public void upgradefrom20() throws Exception {
[syncope] branch master updated: now transformed connObjectKey is taken into account while pulling
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 5c6c6d2 now transformed connObjectKey is taken into account while
pulling
5c6c6d2 is described below
commit 5c6c6d22847ec2c95169632ff8138f5749cdf34a
Author: Andrea Patricelli
AuthorDate: Fri Nov 29 19:09:15 2019 +0100
now transformed connObjectKey is taken into account while pulling
---
.../provisioning/java/pushpull/InboundMatcher.java | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
index 870f47d..bb7c880 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
@@ -235,17 +235,17 @@ public class InboundMatcher {
if (intAttrName.getField() != null) {
switch (intAttrName.getField()) {
case "key":
-
Optional.ofNullable(anyUtils.dao().find(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(anyUtils.dao().find(finalConnObjectKeyValue)).ifPresent(anys::add);
break;
case "username":
if (anyTypeKind == AnyTypeKind.USER && ignoreCaseMatch) {
AnyCond cond = new AnyCond(AttributeCond.Type.IEQ);
cond.setSchema("username");
-cond.setExpression(connObjectKeyValue);
+cond.setExpression(finalConnObjectKeyValue);
anys.addAll(searchDAO.search(SearchCond.getLeafCond(cond), AnyTypeKind.USER));
} else {
-
Optional.ofNullable(userDAO.findByUsername(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(userDAO.findByUsername(finalConnObjectKeyValue)).ifPresent(anys::add);
}
break;
@@ -253,19 +253,19 @@ public class InboundMatcher {
if (anyTypeKind == AnyTypeKind.GROUP && ignoreCaseMatch) {
AnyCond cond = new AnyCond(AttributeCond.Type.IEQ);
cond.setSchema("name");
-cond.setExpression(connObjectKeyValue);
+cond.setExpression(finalConnObjectKeyValue);
anys.addAll(searchDAO.search(SearchCond.getLeafCond(cond), AnyTypeKind.GROUP));
} else {
-
Optional.ofNullable(groupDAO.findByName(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(groupDAO.findByName(finalConnObjectKeyValue)).ifPresent(anys::add);
}
if (anyTypeKind == AnyTypeKind.ANY_OBJECT &&
ignoreCaseMatch) {
AnyCond cond = new AnyCond(AttributeCond.Type.IEQ);
cond.setSchema("name");
-cond.setExpression(connObjectKeyValue);
+cond.setExpression(finalConnObjectKeyValue);
anys.addAll(searchDAO.search(SearchCond.getLeafCond(cond),
AnyTypeKind.ANY_OBJECT));
} else {
-
Optional.ofNullable(anyObjectDAO.findByName(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(anyObjectDAO.findByName(finalConnObjectKeyValue)).ifPresent(anys::add);
}
break;
@@ -278,10 +278,10 @@ public class InboundMatcher {
? anyUtils.newPlainAttrUniqueValue()
: anyUtils.newPlainAttrValue();
try {
-value.parseValue((PlainSchema)
intAttrName.getSchema(), connObjectKeyValue);
+value.parseValue((PlainSchema)
intAttrName.getSchema(), finalConnObjectKeyValue);
} catch (ParsingValidationException e) {
LOG.error("While parsing provided {} {}", Uid.NAME,
value, e);
-value.setStringValue(connObjectKeyValue);
+value.setStringValue(finalConnObjectKeyValue);
}
if (intAttrName.getSchema().isUniqueConstraint()) {
@@ -296,7 +296,7 @@ public class InboundMatcher {
case DERIVED:
anys.addAll(anyUtils.dao().findByDerAttrValue((
[syncope] branch 2_1_X updated: now transformed connObjectKey is taken into account while pulling
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new a56600a now transformed connObjectKey is taken into account while
pulling
a56600a is described below
commit a56600a7d79910a261dcdddb08b943398180008d
Author: Andrea Patricelli
AuthorDate: Fri Nov 29 19:05:04 2019 +0100
now transformed connObjectKey is taken into account while pulling
---
.../provisioning/java/pushpull/InboundMatcher.java | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
index 870f47d..19947ed 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
@@ -235,17 +235,17 @@ public class InboundMatcher {
if (intAttrName.getField() != null) {
switch (intAttrName.getField()) {
case "key":
-
Optional.ofNullable(anyUtils.dao().find(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(anyUtils.dao().find(finalConnObjectKeyValue)).ifPresent(anys::add);
break;
case "username":
if (anyTypeKind == AnyTypeKind.USER && ignoreCaseMatch) {
AnyCond cond = new AnyCond(AttributeCond.Type.IEQ);
cond.setSchema("username");
-cond.setExpression(connObjectKeyValue);
+cond.setExpression(finalConnObjectKeyValue);
anys.addAll(searchDAO.search(SearchCond.getLeafCond(cond), AnyTypeKind.USER));
} else {
-
Optional.ofNullable(userDAO.findByUsername(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(userDAO.findByUsername(finalConnObjectKeyValue)).ifPresent(anys::add);
}
break;
@@ -253,19 +253,19 @@ public class InboundMatcher {
if (anyTypeKind == AnyTypeKind.GROUP && ignoreCaseMatch) {
AnyCond cond = new AnyCond(AttributeCond.Type.IEQ);
cond.setSchema("name");
-cond.setExpression(connObjectKeyValue);
+cond.setExpression(finalConnObjectKeyValue);
anys.addAll(searchDAO.search(SearchCond.getLeafCond(cond), AnyTypeKind.GROUP));
} else {
-
Optional.ofNullable(groupDAO.findByName(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(groupDAO.findByName(finalConnObjectKeyValue)).ifPresent(anys::add);
}
if (anyTypeKind == AnyTypeKind.ANY_OBJECT &&
ignoreCaseMatch) {
AnyCond cond = new AnyCond(AttributeCond.Type.IEQ);
cond.setSchema("name");
-cond.setExpression(connObjectKeyValue);
+cond.setExpression(finalConnObjectKeyValue);
anys.addAll(searchDAO.search(SearchCond.getLeafCond(cond),
AnyTypeKind.ANY_OBJECT));
} else {
-
Optional.ofNullable(anyObjectDAO.findByName(connObjectKeyValue)).ifPresent(anys::add);
+
Optional.ofNullable(anyObjectDAO.findByName(finalConnObjectKeyValue)).ifPresent(anys::add);
}
break;
@@ -278,10 +278,10 @@ public class InboundMatcher {
? anyUtils.newPlainAttrUniqueValue()
: anyUtils.newPlainAttrValue();
try {
-value.parseValue((PlainSchema)
intAttrName.getSchema(), connObjectKeyValue);
+value.parseValue((PlainSchema)
intAttrName.getSchema(), finalConnObjectKeyValue);
} catch (ParsingValidationException e) {
LOG.error("While parsing provided {} {}", Uid.NAME,
value, e);
-value.setStringValue(connObjectKeyValue);
+value.setStringValue(finalConnObjectKeyValue);
}
if (intAttrName.getSchema().isUniqueConstraint()) {
@@ -296,7 +296,7 @@ public class InboundMatcher {
case DERIVED:
anys.addAll(anyUtils.dao().findByDerAttrValue((
[syncope] branch 2_0_X updated: avoid unnecessary serialization
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 60f4b37 avoid unnecessary serialization
60f4b37 is described below
commit 60f4b37047d181bb969a6a6c49cff4155d1062c6
Author: Andrea Patricelli
AuthorDate: Tue Nov 26 17:38:40 2019 +0100
avoid unnecessary serialization
---
.../org/apache/syncope/core/provisioning/java/DefaultAuditManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAuditManager.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAuditManager.java
index d58349c..05225fa 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAuditManager.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAuditManager.java
@@ -120,7 +120,7 @@ public class DefaultAuditManager implements AuditManager {
String serializedAuditEntry = POJOHelper.serialize(auditEntry);
if (throwable == null) {
logger.debug(serializedAuditEntry);
-eventLogger.debug(POJOHelper.serialize(auditEntry));
+eventLogger.debug(serializedAuditEntry);
} else {
logger.debug(serializedAuditEntry, throwable);
eventLogger.debug(serializedAuditEntry, throwable);
[syncope] branch 2_1_X updated: fixed core upgrader: custom pull correlation rule migration now uses custom configuration
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new c327fce fixed core upgrader: custom pull correlation rule migration
now uses custom configuration
c327fce is described below
commit c327fce5e6dc4da384878d10496b12c6d6bc276f
Author: Andrea Patricelli
AuthorDate: Thu Nov 21 17:45:43 2019 +0100
fixed core upgrader: custom pull correlation rule migration now uses custom
configuration
---
.../syncope/core/upgrade/GenerateUpgradeSQL.java | 13 +++
.../core/upgrade/GeneratedUpgradeSQLTest.java | 26 +++---
core/upgrade/src/test/resources/syncopedb20.sql| 2 +-
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
index 2c2c3a4..014b6ca 100644
---
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
+++
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
@@ -119,10 +119,15 @@ public final class GenerateUpgradeSQL {
if (specification.has("correlationRules")) {
specification.get("correlationRules").fields().forEachRemaining(entry -> {
ObjectNode body = MAPPER.createObjectNode();
-body.put("@class",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
-body.put("name",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
-body.set("schemas", entry.getValue());
-
+if
((entry.getValue().asText().contains("org.apache.syncope"))) {
+final String confClassName =
entry.getValue().asText() + "Conf";
+body.put("@class", confClassName);
+body.put("name", confClassName);
+} else {
+body.put("@class",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
+body.put("name",
"org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf");
+body.set("schemas", entry.getValue());
+}
try {
String implementationId = "PullCorrelationRule_" +
entry.getKey() + "_" + id;
OUT.write("INSERT INTO
Implementation(id,type,engine,body) VALUES("
diff --git
a/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
b/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
index 148797b..af16116 100644
---
a/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
+++
b/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java
@@ -20,10 +20,16 @@ package org.apache.syncope.core.upgrade;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.AssertionsKt.fail;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.sql.DataSource;
import org.junit.jupiter.api.Test;
@@ -54,6 +60,8 @@ public class GeneratedUpgradeSQLTest {
@Autowired
private DataSource syncope20DataSource;
+private static final String TEST_PULL_RULE =
"org.apache.syncope.fit.core.reference.TestPullRuleConf";
+
@Test
public void upgradefrom20() throws Exception {
StringWriter out = new StringWriter();
@@ -76,9 +84,21 @@ public class GeneratedUpgradeSQLTest {
JdbcTemplate jdbcTemplate = new JdbcTemplate(syncope20DataSource);
-Integer implementations = jdbcTemplate.queryForObject("SELECT COUNT(*)
FROM Implementation", Integer.class);
+// check that custom JAVA PullCorrelationRule(s) have been moved to
correct implementation with PullCorrelationRuleConf
+List> implementations =
jdbcTemplate.queryForList("SELECT * FROM Implementation");
assertNotNull(implementations);
-assertEquals(15, imp
[syncope] branch 2_1_X updated: fixed wrong type for password rule implementation in core upgrader
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 3003b47 fixed wrong type for password rule implementation in core
upgrader
3003b47 is described below
commit 3003b47bbb3b92acb86e5c443ac1b6631c3a1159
Author: Andrea Patricelli
AuthorDate: Tue Nov 19 16:27:58 2019 +0100
fixed wrong type for password rule implementation in core upgrader
---
.../main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
index 15756f7..2c2c3a4 100644
---
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
+++
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
@@ -183,7 +183,7 @@ public final class GenerateUpgradeSQL {
String implementationId = "PasswordRule_" + passwordPolicyId +
"_" + id;
OUT.write("INSERT INTO Implementation(id,type,engine,body)
VALUES("
+ "'" + implementationId + "',"
-+ "'ACCOUNT_RULE',"
++ "'PASSWORD_RULE',"
+ "'JAVA',"
+ "'" + serializedInstance + "');\n");
OUT.write("INSERT INTO
PasswordPolicyRule(policy_id,implementation_id) VALUES("
[syncope] branch master updated: fixes missing icon for reconciliation pull action
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 087926e fixes missing icon for reconciliation pull action 087926e is described below commit 087926ee1330ec4830ad947a49f1a6286e353055 Author: Andrea Patricelli AuthorDate: Mon Nov 18 10:16:50 2019 +0100 fixes missing icon for reconciliation pull action --- .../client/console/wicket/markup/html/form/ActionsPanel_it.properties | 4 +++- .../client/console/wicket/markup/html/form/ActionsPanel_ja.properties | 4 +++- .../console/wicket/markup/html/form/ActionsPanel_pt_BR.properties | 4 +++- .../client/console/wicket/markup/html/form/ActionsPanel_ru.properties | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index c47a9fb..ee38bd0 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -256,10 +256,12 @@ zoom_out.alt=zoom-out icon workflow_modeler.class=fa fa-picture-o workflow_modeler.title=workflow modeler workflow_modeler.alt=workflow modeler icon + reconciliation_push.class=fa fa-chevron-circle-right reconciliation_push.title=push reconciliation_push.alt=reconciliation push icon -reconciliation_pull.class=fa-chevron-circle-left + +reconciliation_pull.class=fa fa-chevron-circle-left reconciliation_pull.title=pull reconciliation_pull.alt=reconciliation pull icon diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties index 6f1cd13..a6422d1 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties @@ -257,10 +257,12 @@ zoom_out.alt=\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8 workflow_modeler.class=fa fa-picture-o workflow_modeler.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u2015 workflow_modeler.alt=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u2015 + reconciliation_push.class=fa fa-chevron-circle-right reconciliation_push.title=\u30d7\u30c3\u30b7\u30e5 reconciliation_push.alt=\u7167\u5408\u30d7\u30c3\u30b7\u30e5 icon -reconciliation_pull.class=fa-chevron-circle-left + +reconciliation_pull.class=fa fa-chevron-circle-left reconciliation_pull.title=\u30d7\u30eb reconciliation_pull.alt=\u7167\u5408\u30d7\u30eb icon diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties index 8a956d8..ccc7a37 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties @@ -269,10 +269,12 @@ zoom_in.alt=zoom-in icon zoom_out.class=fa fa-search-minus zoom_out.title=zoom-out zoom_out.alt=zoom-out icon + reconciliation_push.class=fa fa-chevron-circle-right reconciliation_push.title=push reconciliation_push.alt=reconciliation push icon -reconciliation_pull.class=fa-chevron-circle-left + +reconciliation_pull.class=fa fa-chevron-circle-left reconciliation_pull.title=pull reconciliation_pull.alt=reconciliation pull icon diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties index 1d3bf94..ada11f2 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties @@ -256,10 +256,12 @@ zoom_out.alt=zoom-out icon workflow_modeler.class=fa fa-picture-o workflow_modeler.title=workflow modeler workflow_modeler.alt=workflow modeler icon + reconciliation_push.class
[syncope] branch 2_1_X updated: fixes missing icon for reconciliation pull action
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new d1b933b fixes missing icon for reconciliation pull action d1b933b is described below commit d1b933b1815aabd5dd3a1d37168c899b64a0444f Author: Andrea Patricelli AuthorDate: Mon Nov 18 10:14:10 2019 +0100 fixes missing icon for reconciliation pull action --- .../client/console/wicket/markup/html/form/ActionsPanel_it.properties | 3 ++- .../client/console/wicket/markup/html/form/ActionsPanel_ja.properties | 3 ++- .../client/console/wicket/markup/html/form/ActionsPanel_ru.properties | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index 6b27dc2..760b241 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -267,7 +267,8 @@ workflow_modeler.alt=workflow modeler icon reconciliation_push.class=fa fa-chevron-circle-right reconciliation_push.title=push reconciliation_push.alt=reconciliation push icon -reconciliation_pull.class=fa-chevron-circle-left + +reconciliation_pull.class=fa fa-chevron-circle-left reconciliation_pull.title=pull reconciliation_pull.alt=reconciliation pull icon diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties index d7d6dca..e2c053a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties @@ -269,7 +269,8 @@ workflow_modeler.alt=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u201 reconciliation_push.class=fa fa-chevron-circle-right reconciliation_push.title=\u30d7\u30c3\u30b7\u30e5 reconciliation_push.alt=\u7167\u5408\u30d7\u30c3\u30b7\u30e5 icon -reconciliation_pull.class=fa-chevron-circle-left + +reconciliation_pull.class=fa fa-chevron-circle-left reconciliation_pull.title=\u30d7\u30eb reconciliation_pull.alt=\u7167\u5408\u30d7\u30eb icon diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties index bab6993..d3ef6cc 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties @@ -264,10 +264,12 @@ zoom_out.alt=zoom-out icon workflow_modeler.class=fa fa-picture-o workflow_modeler.title=workflow modeler workflow_modeler.alt=workflow modeler icon + reconciliation_push.class=fa fa-chevron-circle-right reconciliation_push.title=push reconciliation_push.alt=reconciliation push icon -reconciliation_pull.class=fa-chevron-circle-left + +reconciliation_pull.class=fa fa-chevron-circle-left reconciliation_pull.title=pull reconciliation_pull.alt=reconciliation pull icon
[syncope] branch master updated: fixing italian translation for schemas
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 55cff7e fixing italian translation for schemas 55cff7e is described below commit 55cff7eb557098116b44e8989bc9c2294b1eeab7 Author: Andrea Patricelli AuthorDate: Tue Nov 12 09:05:16 2019 +0100 fixing italian translation for schemas --- .../apache/syncope/client/console/panels/SchemasPanel_it.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties index 52622d0..eb18b6a 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties @@ -22,9 +22,9 @@ enumerationKeys= Label enumeration multivalue=Multivalore type=Tipo title=Schema -readonly=Read-only +readonly=Sola lettura uniqueConstraint=Univoco -expression=Express\u00e3o -resource=Resource +expression=Espressione +resource=Risorsa extAttrName=ExtAttrName anyType=Tipo
[syncope] branch 2_0_X updated: fixing italian translation for schemas
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new a62eed9 fixing italian translation for schemas a62eed9 is described below commit a62eed9ae0be3e311655fb449010522727e8d039 Author: Andrea Patricelli AuthorDate: Tue Nov 12 09:02:31 2019 +0100 fixing italian translation for schemas --- .../apache/syncope/client/console/panels/SchemasPanel_it.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties index 52622d0..eb18b6a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties @@ -22,9 +22,9 @@ enumerationKeys= Label enumeration multivalue=Multivalore type=Tipo title=Schema -readonly=Read-only +readonly=Sola lettura uniqueConstraint=Univoco -expression=Express\u00e3o -resource=Resource +expression=Espressione +resource=Risorsa extAttrName=ExtAttrName anyType=Tipo
[syncope] branch 2_1_X updated: fixing italian translation for schemas
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 09f69de fixing italian translation for schemas 09f69de is described below commit 09f69debe501ad5fd8f8a8d5e3d295bb0ee1a9fc Author: Andrea Patricelli AuthorDate: Tue Nov 12 09:02:31 2019 +0100 fixing italian translation for schemas --- .../apache/syncope/client/console/panels/SchemasPanel_it.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties index 52622d0..eb18b6a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel_it.properties @@ -22,9 +22,9 @@ enumerationKeys= Label enumeration multivalue=Multivalore type=Tipo title=Schema -readonly=Read-only +readonly=Sola lettura uniqueConstraint=Univoco -expression=Express\u00e3o -resource=Resource +expression=Espressione +resource=Risorsa extAttrName=ExtAttrName anyType=Tipo
[syncope] branch master updated: restored missing properties in ActionsPanel
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 3f59156 restored missing properties in ActionsPanel 3f59156 is described below commit 3f591564bb879722fee1bbd0a1b736b956155b83 Author: Andrea Patricelli AuthorDate: Wed Nov 6 17:17:23 2019 +0100 restored missing properties in ActionsPanel --- .../markup/html/form/ActionsPanel.properties | 40 ++ .../markup/html/form/ActionsPanel_it.properties| 31 ++ .../markup/html/form/ActionsPanel_ja.properties| 32 +++ .../markup/html/form/ActionsPanel_pt_BR.properties | 48 ++ .../markup/html/form/ActionsPanel_ru.properties| 31 ++ 5 files changed, 182 insertions(+) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties index 6831a2b..3d26fa9 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties @@ -46,6 +46,14 @@ edit.class=glyphicon glyphicon-pencil edit.title=edit edit.alt=edit icon +manage_approval.class=fa fa-pencil-square-o +manage_approval.title=manage +manage_approval.alt=manage approval icon + +edit_approval.class=glyphicon glyphicon-pencil +edit_approval.title=edit +edit_approval.alt=edit approval icon + type_extensions.class=fa fa-expand type_extensions.title=extensions type_extensions.alt=extensions icon @@ -54,6 +62,14 @@ fo_edit.class=fa fa-file-code-o fo_edit.title=fo fo_edit.alt=fo icon +fo_manage_approval.class=fa fa-file-code-o +fo_manage_approval.title=fo +fo_manage_approval.alt=fo icon + +fo_edit_approval.class=fa fa-file-code-o +fo_edit_approval.title=fo +fo_edit_approval.alt=fo icon + html.class=fa fa-file-code-o html.title=html html.alt=html icon @@ -90,6 +106,18 @@ members.class=fa fa-users members.title=members members.alt=members icon +view_executions.class=fa fa-eye +view_executions.title=view executions +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=view details +view_details.alt=view details icon + +members.class=fa fa-users +members.title=members +members.alt=members icon + search.class=glyphicon glyphicon-search search.title=search search.alt=search icon @@ -118,6 +146,10 @@ claim.class=fa fa-ticket claim.title=claim claim.alt=claim icon +unclaim.class=fa fa-undo +unclaim.title=unclaim +unclaim.alt=unclaim icon + select.class=glyphicon glyphicon-ok select.title=select select.alt=select icon @@ -150,6 +182,10 @@ export_xml.class=fa fa-file-excel-o export_xml.title=export as xml export_xml.alt=export as xml icon +restore.class=fa fa-arrow-circle-down +restore.title=restore +restore.alt=restore icon + suspend.class=glyphicon glyphicon-ban-circle suspend.title=suspend suspend.alt=suspend icon @@ -237,3 +273,7 @@ zoom_out.alt=zoom-out icon manage_accounts.class=fa fa-users manage_accounts.title=manage accounts manage_accounts.alt=manage accounts icon + +workflow_modeler.class=fa fa-picture-o +workflow_modeler.title=workflow modeler +workflow_modeler.alt=workflow modeler icon diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index 2e13f6e..c47a9fb 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -46,6 +46,14 @@ edit.class=glyphicon glyphicon-pencil edit.title=modifica edit.alt=edit icon +manage_approval.class=fa fa-pencil-square-o +manage_approval.title=manage +manage_approval.alt=manage approval icon + +edit_approval.class=glyphicon glyphicon-pencil +edit_approval.title=edit +edit_approval.alt=edit approval icon + type_extensions.class=fa fa-expand type_extensions.title=estensioni type_extensions.alt=extensions icon @@ -54,6 +62,14 @@ fo_edit.class=fa fa-file-code-o fo_edit.title=fo fo_edit.alt=fo icon +fo_manage_approval.class=fa fa-file-code-o +fo_manage_approval.title=fo +fo_manage_approval.alt=fo icon + +fo_edit_approval.class=fa fa-file-code-o +fo_edit_approval.title=fo +fo_edit_approval.alt=fo icon + html.class=fa fa-file-code-o html.title=html html.alt=html icon @@ -86,6
[syncope] branch 2_0_X updated: restored missing properties in ActionsPanel
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new 5bbf017 restored missing properties in ActionsPanel 5bbf017 is described below commit 5bbf01757f7d94352cfc94a070aeeb6086deac7d Author: Andrea Patricelli AuthorDate: Wed Nov 6 17:07:33 2019 +0100 restored missing properties in ActionsPanel --- .../markup/html/form/ActionsPanel.properties | 35 ++ .../markup/html/form/ActionsPanel_it.properties| 31 .../markup/html/form/ActionsPanel_ja.properties| 42 +++--- .../markup/html/form/ActionsPanel_pt_BR.properties | 39 .../markup/html/form/ActionsPanel_ru.properties| 31 5 files changed, 173 insertions(+), 5 deletions(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties index e5affd7..dc5b325 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties @@ -46,6 +46,13 @@ edit.class=glyphicon glyphicon-pencil edit.title=edit edit.alt=edit icon +manage_approval.class=fa fa-pencil-square-o +manage_approval.title=manage +manage_approval.alt=manage approval icon +edit_approval.class=glyphicon glyphicon-pencil +edit_approval.title=edit +edit_approval.alt=edit approval icon + type_extensions.class=fa fa-expand type_extensions.title=extensions type_extensions.alt=extensions icon @@ -54,6 +61,14 @@ fo_edit.class=fa fa-file-code-o fo_edit.title=fo fo_edit.alt=fo icon +fo_manage_approval.class=fa fa-file-code-o +fo_manage_approval.title=fo +fo_manage_approval.alt=fo icon + +fo_edit_approval.class=fa fa-file-code-o +fo_edit_approval.title=fo +fo_edit_approval.alt=fo icon + html.class=fa fa-file-code-o html.title=html html.alt=html icon @@ -86,6 +101,14 @@ view.class=fa fa-eye view.title=view view.alt=view icon +view_executions.class=fa fa-eye +view_executions.title=view executions +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=view details +view_details.alt=view details icon + members.class=fa fa-users members.title=members members.alt=members icon @@ -118,6 +141,10 @@ claim.class=fa fa-ticket claim.title=claim claim.alt=claim icon +unclaim.class=fa fa-undo +unclaim.title=unclaim +unclaim.alt=unclaim icon + select.class=glyphicon glyphicon-ok select.title=select select.alt=select icon @@ -150,6 +177,10 @@ export_xml.class=fa fa-file-excel-o export_xml.title=export as xml export_xml.alt=export as xml icon +restore.class=fa fa-arrow-circle-down +restore.title=restore +restore.alt=restore icon + suspend.class=glyphicon glyphicon-ban-circle suspend.title=suspend suspend.alt=suspend icon @@ -233,3 +264,7 @@ zoom_in.alt=zoom-in icon zoom_out.class=fa fa-search-minus zoom_out.title=zoom-out zoom_out.alt=zoom-out icon + +workflow_modeler.class=fa fa-picture-o +workflow_modeler.title=workflow modeler +workflow_modeler.alt=workflow modeler icon diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index d0dbb16..cdcddf3 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -46,6 +46,14 @@ edit.class=glyphicon glyphicon-pencil edit.title=modifica edit.alt=edit icon +manage_approval.class=fa fa-pencil-square-o +manage_approval.title=gestisci approvazioni +manage_approval.alt=manage approval icon + +edit_approval.class=glyphicon glyphicon-pencil +edit_approval.title=modifica +edit_approval.alt=edit approval icon + type_extensions.class=fa fa-expand type_extensions.title=estensioni type_extensions.alt=extensions icon @@ -54,6 +62,14 @@ fo_edit.class=fa fa-file-code-o fo_edit.title=fo fo_edit.alt=fo icon +fo_manage_approval.class=fa fa-file-code-o +fo_manage_approval.title=fo +fo_manage_approval.alt=fo icon + +fo_edit_approval.class=fa fa-file-code-o +fo_edit_approval.title=fo +fo_edit_approval.alt=fo icon + html.class=fa fa-file-code-o html.title=html html.alt=html icon @@ -86,6 +102,14 @@ view.class=fa fa-eye view.title=vedi view.alt=view icon +view_executions.class=fa fa-eye +view_executions.title=vedi esecuzioni
[syncope] branch 2_1_X updated: restored missing properties in ActionsPanel
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 4257d7c restored missing properties in ActionsPanel 4257d7c is described below commit 4257d7c0073e5021fd117167d9ea223a3624a19f Author: Andrea Patricelli AuthorDate: Wed Nov 6 17:07:33 2019 +0100 restored missing properties in ActionsPanel --- .../markup/html/form/ActionsPanel.properties | 35 +++ .../markup/html/form/ActionsPanel_it.properties| 31 + .../markup/html/form/ActionsPanel_ja.properties| 39 -- .../markup/html/form/ActionsPanel_pt_BR.properties | 39 ++ .../markup/html/form/ActionsPanel_ru.properties| 31 + 5 files changed, 172 insertions(+), 3 deletions(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties index bb6ce25..333adca 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties @@ -46,6 +46,13 @@ edit.class=glyphicon glyphicon-pencil edit.title=edit edit.alt=edit icon +manage_approval.class=fa fa-pencil-square-o +manage_approval.title=manage +manage_approval.alt=manage approval icon +edit_approval.class=glyphicon glyphicon-pencil +edit_approval.title=edit +edit_approval.alt=edit approval icon + type_extensions.class=fa fa-expand type_extensions.title=extensions type_extensions.alt=extensions icon @@ -54,6 +61,14 @@ fo_edit.class=fa fa-file-code-o fo_edit.title=fo fo_edit.alt=fo icon +fo_manage_approval.class=fa fa-file-code-o +fo_manage_approval.title=fo +fo_manage_approval.alt=fo icon + +fo_edit_approval.class=fa fa-file-code-o +fo_edit_approval.title=fo +fo_edit_approval.alt=fo icon + html.class=fa fa-file-code-o html.title=html html.alt=html icon @@ -86,6 +101,14 @@ view.class=fa fa-eye view.title=view view.alt=view icon +view_executions.class=fa fa-eye +view_executions.title=view executions +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=view details +view_details.alt=view details icon + members.class=fa fa-users members.title=members members.alt=members icon @@ -126,6 +149,10 @@ claim.class=fa fa-ticket claim.title=claim claim.alt=claim icon +unclaim.class=fa fa-undo +unclaim.title=unclaim +unclaim.alt=unclaim icon + select.class=glyphicon glyphicon-ok select.title=select select.alt=select icon @@ -158,6 +185,10 @@ export_xml.class=fa fa-file-excel-o export_xml.title=export as xml export_xml.alt=export as xml icon +restore.class=fa fa-arrow-circle-down +restore.title=restore +restore.alt=restore icon + suspend.class=glyphicon glyphicon-ban-circle suspend.title=suspend suspend.alt=suspend icon @@ -245,3 +276,7 @@ zoom_out.alt=zoom-out icon manage_accounts.class=fa fa-users manage_accounts.title=manage accounts manage_accounts.alt=manage accounts icon + +workflow_modeler.class=fa fa-picture-o +workflow_modeler.title=workflow modeler +workflow_modeler.alt=workflow modeler icon diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index db25eaa..6b27dc2 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -46,6 +46,14 @@ edit.class=glyphicon glyphicon-pencil edit.title=modifica edit.alt=edit icon +manage_approval.class=fa fa-pencil-square-o +manage_approval.title=gestisci approvazioni +manage_approval.alt=manage approval icon + +edit_approval.class=glyphicon glyphicon-pencil +edit_approval.title=modifica +edit_approval.alt=edit approval icon + type_extensions.class=fa fa-expand type_extensions.title=estensioni type_extensions.alt=extensions icon @@ -54,6 +62,14 @@ fo_edit.class=fa fa-file-code-o fo_edit.title=fo fo_edit.alt=fo icon +fo_manage_approval.class=fa fa-file-code-o +fo_manage_approval.title=fo +fo_manage_approval.alt=fo icon + +fo_edit_approval.class=fa fa-file-code-o +fo_edit_approval.title=fo +fo_edit_approval.alt=fo icon + html.class=fa fa-file-code-o html.title=html html.alt=html icon @@ -86,6 +102,14 @@ view.class=fa fa-eye view.title=vedi view.alt=view icon +view_executions.class=fa fa-eye
[syncope] branch 2_1_X updated: missing translations for executions and details actions on propagation tasks
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new d0bb2c4 missing translations for executions and details actions on propagation tasks d0bb2c4 is described below commit d0bb2c4b8037185e5d9014a3a715c4e6d762a155 Author: Andrea Patricelli AuthorDate: Wed Nov 6 12:48:43 2019 +0100 missing translations for executions and details actions on propagation tasks --- .../console/wicket/markup/html/form/ActionsPanel_it.properties| 8 .../console/wicket/markup/html/form/ActionsPanel_ja.properties| 8 .../console/wicket/markup/html/form/ActionsPanel_pt_BR.properties | 8 .../console/wicket/markup/html/form/ActionsPanel_ru.properties| 8 4 files changed, 32 insertions(+) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties index 2e13f6e..db25eaa 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties @@ -94,6 +94,14 @@ search.class=glyphicon glyphicon-search search.title=ricerca search.alt=search icon +view_executions.class=fa fa-eye +view_executions.title=esecuzioni +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=dettagli +view_details.alt=details icon + delete.class=glyphicon glyphicon-minus delete.title=elimina delete.alt=delete icon diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties index 421abc9..1e38f07 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties @@ -90,6 +90,14 @@ members.class=fa fa-users members.title=\u30e1\u30f3\u30d0\u30fc members.alt=\u30e1\u30f3\u30d0\u30fc +view_executions.class=fa fa-eye +view_executions.title=\u6b7b\u5211\u57f7\u884c +view_executions.alt=\u5b9f\u884c\u30a2\u30a4\u30b3\u30f3\u3092\u8868\u793a + +view_details.class=fa fa-info-circle +view_details.title=\u8a73\u7d30 +view_details.alt=\u8a73\u7d30\u30a2\u30a4\u30b3\u30f3 + search.class=glyphicon glyphicon-search search.title=\u691c\u7d22 search.alt=\u691c\u7d22 diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties index 7a61862..eca89cf 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties @@ -90,6 +90,14 @@ members.class=fa fa-users members.title=members members.alt=members icon +view_executions.class=fa fa-eye +view_executions.title=execu\u00e7\u00f5es +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=detalhes +view_details.alt=details icon + search.class=glyphicon glyphicon-search search.title=search search.alt=search icon diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties index d825127..fddb501 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties @@ -90,6 +90,14 @@ members.class=fa fa-users members.title=members members.alt=members icon +view_executions.class=fa fa-eye +view_executions.title=\u043a\u0430\u0437\u043d\u0438 +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=\u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438 +view_details.alt=details icon + search.class=glyphicon glyphicon-search search.title=search search.alt=search icon
[syncope] branch 2_1_X updated: (re)added missing properties for action links on propagation tasks
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new e1ef0be (re)added missing properties for action links on propagation tasks e1ef0be is described below commit e1ef0be9b895daaeb895adc393cb84bb34ff1979 Author: Andrea Patricelli AuthorDate: Wed Nov 6 11:57:40 2019 +0100 (re)added missing properties for action links on propagation tasks --- .../console/wicket/markup/html/form/ActionsPanel.properties | 8 1 file changed, 8 insertions(+) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties index 6831a2b..bb6ce25 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties @@ -94,6 +94,14 @@ search.class=glyphicon glyphicon-search search.title=search search.alt=search icon +view_executions.class=fa fa-eye +view_executions.title=executions +view_executions.alt=view executions icon + +view_details.class=fa fa-info-circle +view_details.title=details +view_details.alt=details icon + delete.class=glyphicon glyphicon-minus delete.title=delete delete.alt=delete icon
[syncope] branch master updated: upgrading HikariCP
This is an automated email from the ASF dual-hosted git repository. andreapatricelli 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 4b20e81 upgrading HikariCP 4b20e81 is described below commit 4b20e81b05948da257eded5601b5538cf92f919d Author: Andrea Patricelli AuthorDate: Mon Oct 21 15:48:13 2019 +0200 upgrading HikariCP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa5785d..3c286c1 100644 --- a/pom.xml +++ b/pom.xml @@ -409,7 +409,7 @@ under the License. 2.1.3.RELEASE 3.1.0 -3.4.0 +3.4.1 6.0.17.Final 1.9.3
[syncope] 02/02: upgrading HikariCP
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git commit 9e6417ff3859d39e0c193056e19e9375d7967c43 Author: Andrea Patricelli AuthorDate: Mon Oct 21 15:45:12 2019 +0200 upgrading HikariCP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c83e4e2..5646b97 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ under the License. 5.1.6.RELEASE 3.1.0 -3.4.0 +3.4.1 6.0.17.Final 1.9.3
[syncope] 01/02: chnaged transaction isolation default value for JBoss persistence configuration
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git commit 7bea0fb9267c493c2fe15a248b254b5e9ebb1549 Author: Andrea Patricelli AuthorDate: Mon Oct 21 15:44:33 2019 +0200 chnaged transaction isolation default value for JBoss persistence configuration --- fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml | 4 +--- fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml| 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml index 86d9ba4..004e2b4 100644 --- a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml +++ b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml @@ -54,9 +54,7 @@ under the License. - - - + diff --git a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml index f883838..202a042 100644 --- a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml +++ b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml @@ -54,9 +54,7 @@ under the License. - - - +
[syncope] branch 2_1_X updated (2440eb8 -> 9e6417f)
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from 2440eb8 Upgrading Swagger UI and modernizer-maven-plugin new 7bea0fb chnaged transaction isolation default value for JBoss persistence configuration new 9e6417f upgrading HikariCP The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml | 4 +--- fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml| 4 +--- pom.xml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-)
[syncope] branch master updated: [SYNCOPE-1421] nicer enduser test name
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 f296b57 [SYNCOPE-1421] nicer enduser test name
f296b57 is described below
commit f296b577d24188780c6601ecc0cdbbac1a06b46e
Author: Andrea Patricelli
AuthorDate: Thu Jun 13 18:03:47 2019 +0200
[SYNCOPE-1421] nicer enduser test name
---
.../fit/enduser/{SelfRegistrationITCase.java => EnduserITCase.java} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/enduser/SelfRegistrationITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/enduser/EnduserITCase.java
similarity index 99%
rename from
fit/core-reference/src/test/java/org/apache/syncope/fit/enduser/SelfRegistrationITCase.java
rename to
fit/core-reference/src/test/java/org/apache/syncope/fit/enduser/EnduserITCase.java
index bfa2ff6..0ddab59 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/enduser/SelfRegistrationITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/enduser/EnduserITCase.java
@@ -41,7 +41,7 @@ import org.apache.wicket.util.tester.FormTester;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-public class SelfRegistrationITCase extends AbstractEnduserITCase {
+public class EnduserITCase extends AbstractEnduserITCase {
private static final String WIZARD_FORM = "body:wizard:form";
[syncope] branch master updated: [SYNCOPE-1421] enabled enduser UI tests, fit with all other IT tests
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 6edb4b0 [SYNCOPE-1421] enabled enduser UI tests, fit with all other
IT tests
6edb4b0 is described below
commit 6edb4b036eaf77c550e9836fb7da5e0a66e2654a
Author: Andrea Patricelli
AuthorDate: Thu Jun 13 14:36:36 2019 +0200
[SYNCOPE-1421] enabled enduser UI tests, fit with all other IT tests
---
.../client/enduser/panels/SelfPwdResetPanel.java | 22 ++-
.../client/enduser/wizards/any/PlainAttrs.java | 3 +-
.../client/enduser/panels/SelfPwdResetPanel.html | 5 +-
.../syncope/fit/enduser/AbstractEnduserITCase.java | 45 +
.../fit/enduser/SelfRegistrationITCase.java| 190 -
.../java/org/apache/syncope/fit/ui/UtilityUIT.java | 10 ++
6 files changed, 227 insertions(+), 48 deletions(-)
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/SelfPwdResetPanel.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/SelfPwdResetPanel.java
index 8e8cb2d..bdec2a5 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/SelfPwdResetPanel.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/SelfPwdResetPanel.java
@@ -28,7 +28,6 @@ import
org.apache.syncope.client.enduser.pages.BaseEnduserWebPage;
import org.apache.syncope.client.enduser.wizards.any.CaptchaPanel;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.DomainDropDown;
-import
org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.common.keymaster.client.api.DomainOps;
import org.apache.syncope.common.keymaster.client.api.model.Domain;
import org.apache.syncope.common.lib.SyncopeClientException;
@@ -77,12 +76,12 @@ public class SelfPwdResetPanel extends Panel implements
IEventSource {
private String usernameText;
+private String securityAnswerText;
+
private final TextField securityQuestion;
private final CaptchaPanel captcha;
-protected final Model securityAnswerModel = new Model<>();
-
public SelfPwdResetPanel(final String id, final PageReference pageRef) {
super(id);
@@ -137,10 +136,17 @@ public class SelfPwdResetPanel extends Panel implements
IEventSource {
};
add(reloadLink);
-AjaxTextFieldPanel securityAnswer =
-new AjaxTextFieldPanel("securityAnswer", "securityAnswer",
securityAnswerModel);
-securityAnswer.setOutputMarkupId(true);
-securityAnswer.setOutputMarkupPlaceholderTag(true);
+TextField securityAnswer =
+new TextField<>("securityAnswer", new PropertyModel<>(this,
"securityAnswerText"), String.class);
+securityAnswer.add(new
AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+
+private static final long serialVersionUID = -1107858522700306810L;
+
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+// do nothing
+}
+});
securityAnswer.setRequired(true);
add(securityAnswer);
@@ -166,7 +172,7 @@ public class SelfPwdResetPanel extends Panel implements
IEventSource {
} else {
try {
SyncopeEnduserSession.get().getService(UserSelfService.class).
-requestPasswordReset(usernameText,
securityAnswerModel.getObject());
+requestPasswordReset(usernameText,
securityAnswerText);
final PageParameters parameters = new PageParameters();
parameters.add(Constants.NOTIFICATION_MSG_PARAM,
getString("self.pwd.reset.success"));
setResponsePage(getApplication().getHomePage(),
parameters);
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/PlainAttrs.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/PlainAttrs.java
index d0189fc..8481591 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/PlainAttrs.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/PlainAttrs.java
@@ -377,7 +377,8 @@ public class PlainAttrs extends
AbstractAttrs {
}
panel.setReadOnly(readOnly);
-
+panel.setMarkupId(StringUtils.isBlank(groupName) ? schemaTO.getKey() :
groupName + "." + schemaTO.getKey());
+
return panel;
}
diff --git
a/client/idrepo/enduser/src/main/resources/org/apache/syncope/c
[syncope] branch master updated: fixes default value initialization in enduser, wizard builder instantiated from class specified in configuration param
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 b0c423a fixes default value initialization in enduser, wizard builder
instantiated from class specified in configuration param
b0c423a is described below
commit b0c423af80d5df8d26163a7ac290e551e8fbd3ed
Author: Andrea Patricelli
AuthorDate: Fri Jun 7 12:14:47 2019 +0200
fixes default value initialization in enduser, wizard builder instantiated
from class specified in configuration param
---
.../apache/syncope/client/enduser/pages/Self.java | 21 -
.../client/enduser/wizards/any/AbstractAttrs.java | 4
.../client/enduser/wizards/any/PlainAttrs.java | 8 +++-
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
index 686f2e2..67bd151 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
@@ -23,9 +23,9 @@ import
org.apache.syncope.client.enduser.SyncopeEnduserSession;
import org.apache.syncope.client.enduser.SyncopeWebApplication;
import org.apache.syncope.client.enduser.layout.FormLayoutInfoUtils;
import org.apache.syncope.client.enduser.layout.UserFormLayoutInfo;
-import org.apache.syncope.client.enduser.wizards.any.UserWizardBuilder;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
+import org.apache.syncope.client.ui.commons.wizards.AjaxWizardBuilder;
import org.apache.syncope.client.ui.commons.wizards.any.AnyWrapper;
import org.apache.syncope.client.ui.commons.wizards.any.UserWrapper;
import org.apache.syncope.common.keymaster.client.api.ConfParamOps;
@@ -45,7 +45,7 @@ public class Self extends BaseEnduserWebPage implements
IEventSource {
@SpringBean
private ConfParamOps confParamOps;
-private UserWizardBuilder userWizardBuilder;
+private AjaxWizardBuilder> wizardBuilder;
protected static final String WIZARD_ID = "wizard";
@@ -97,16 +97,19 @@ public class Self extends BaseEnduserWebPage implements
IEventSource {
"enduser.form.layout.info",
FormLayoutInfoUtils.getDefaultValue(),
String.class);
-userWizardBuilder = new UserWizardBuilder(
-null,
-userTO,
-
SyncopeEnduserSession.get().getService(SyncopeService.class).platform().getUserClasses(),
+
+final UserFormLayoutInfo formLayoutInfo =
StringUtils.isBlank(formLayoutConfParam)
? new UserFormLayoutInfo()
-: FormLayoutInfoUtils.fromJsonString(formLayoutConfParam),
+: FormLayoutInfoUtils.fromJsonString(formLayoutConfParam);
+
+wizardBuilder = (AjaxWizardBuilder>)
FormLayoutInfoUtils.instantiate(
+userTO,
+
SyncopeEnduserSession.get().getService(SyncopeService.class).platform().getUserClasses(),
+formLayoutInfo,
this.getPageReference());
-userWizardBuilder.setItem(new UserWrapper(userTO));
-return userWizardBuilder.build(WIZARD_ID, mode);
+wizardBuilder.setItem(new UserWrapper(userTO));
+return wizardBuilder.build(WIZARD_ID, mode);
}
private UserTO buildNewUserTO(final PageParameters parameters) {
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AbstractAttrs.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AbstractAttrs.java
index 7e64f40..061756b 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AbstractAttrs.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/AbstractAttrs.java
@@ -136,6 +136,10 @@ public abstract class AbstractAttrs
extends WizardStep imple
return whichAttrs.get(schemaName) == null ? false :
whichAttrs.get(schemaName).isReadonly();
}
+protected List getDefaultValues(final String schema) {
+return getDefaultValues(schema, null);
+}
+
protected List getDefaultValues(final String schema, final String
groupName) {
String schemaName =
(org.apache.commons.lang3.StringUtils.isBlank(groupName)
? org.apache.commons.lang3.StringUtils.EMPTY
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/PlainAttrs.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/PlainAttrs.j
[syncope] branch 2_1_X updated: fixed last next button when UR mgmt is active, fixed failing enduser tests
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 0ee29df fixed last next button when UR mgmt is active, fixed failing
enduser tests
0ee29df is described below
commit 0ee29df22c8c82654103070ba14ef6a6b6f855f0
Author: Andrea Patricelli
AuthorDate: Fri Jun 7 09:59:44 2019 +0200
fixed last next button when UR mgmt is active, fixed failing enduser tests
---
.../META-INF/resources/app/js/controllers/UserController.js| 7 +++
.../resources/META-INF/resources/app/views/user-credentials.html | 4 ++--
.../META-INF/resources/app/views/user-derived-schemas.html | 4 ++--
.../resources/META-INF/resources/app/views/user-form-finish.html | 4 ++--
.../main/resources/META-INF/resources/app/views/user-groups.html | 4 ++--
.../resources/META-INF/resources/app/views/user-plain-schemas.html | 4 ++--
.../main/resources/META-INF/resources/app/views/user-requests.html | 4 ++--
.../resources/META-INF/resources/app/views/user-resources.html | 4 ++--
.../META-INF/resources/app/views/user-virtual-schemas.html | 4 ++--
fit/enduser-reference/src/test/resources/tests/abstract.js | 4
fit/enduser-reference/src/test/resources/tests/edit.js | 2 ++
11 files changed, 25 insertions(+), 20 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index d997542..d4e7022 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -23,11 +23,10 @@
angular.module("self").controller("UserController", ['$scope', '$rootScope',
'$location', "$state",
'UserSelfService', 'SchemaService', 'RealmService', 'ResourceService',
'SecurityQuestionService',
- 'GroupService', 'AnyService', 'BpmnProcessService', 'UserRequestsService',
'UserUtil', 'GenericUtil',
- 'ValidationExecutor', '$translate', '$filter',
+ 'GroupService', 'AnyService', 'UserUtil', 'GenericUtil',
'ValidationExecutor', '$translate', '$filter',
function ($scope, $rootScope, $location, $state, UserSelfService,
SchemaService, RealmService,
- ResourceService, SecurityQuestionService, GroupService, AnyService,
BpmnProcessService, UserRequestsService,
- UserUtil, GenericUtil, ValidationExecutor, $translate, $filter) {
+ ResourceService, SecurityQuestionService, GroupService, AnyService,
UserUtil, GenericUtil,
+ ValidationExecutor, $translate, $filter) {
$scope.user = {};
$scope.confirmPassword = {
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
index 68d442c..958659a 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
@@ -76,9 +76,9 @@ under the License.
-
+
-
+
-
+
-
+
-
+
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
index 73a1e88..062a543 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
@@ -43,9 +43,9 @@ under the License.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
[syncope] branch 2_1_X updated: fixed Requests step position in breadcrumb
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 99fdece fixed Requests step position in breadcrumb
99fdece is described below
commit 99fdecee0e27b9eb5d279e3f7376f102e09231ad
Author: Andrea Patricelli
AuthorDate: Thu Jun 6 13:00:37 2019 +0200
fixed Requests step position in breadcrumb
---
client/enduser/src/main/resources/META-INF/resources/app/js/app.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 5b67897..f9c5fe7 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -444,9 +444,12 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', 'InfoService',
$scope.wizard = response.wizard.steps;
$scope.creationWizard = $scope.clone($scope.wizard);
/* */
+var finish = $scope.wizard.finish;
+delete $scope.wizard['finish'];
$scope.wizard.userRequests = {
"url": "/user-requests"
};
+$scope.wizard.finish = finish;
/* */
$scope.wizardFirstStep = response.wizard.firstStep;
[syncope] branch 2_1_X updated: [SYNCOPE-1462] revisited UR management in enduser, fixed not refreshing UR list
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new acbd537 [SYNCOPE-1462] revisited UR management in enduser, fixed not
refreshing UR list
acbd537 is described below
commit acbd537d5312171f760ba407f2af8ad5f22cfa97
Author: Andrea Patricelli
AuthorDate: Thu Jun 6 12:19:05 2019 +0200
[SYNCOPE-1462] revisited UR management in enduser, fixed not refreshing UR
list
---
.../META-INF/resources/app/css/editUser.css| 8 +-
.../resources/app/css/templates/dark/editUser.css | 2 +-
.../resources/META-INF/resources/app/index.html| 2 +-
.../resources/META-INF/resources/app/js/app.js | 13 ---
.../app/js/directives/autoCompleteTextField.js | 47
.../resources/app/js/directives/requestForms.js| 110 --
.../resources/app/js/directives/requests.js| 98 ++--
.../app/js/services/userRequestsService.js | 13 +--
.../resources/app/languages/de/static.json | 4 +-
.../resources/app/languages/en/static.json | 2 +-
.../resources/app/languages/it/static.json | 2 +-
.../resources/app/languages/ja/static.json | 2 +-
.../resources/app/views/autoCompleteTextField.html | 25
.../META-INF/resources/app/views/requestForms.html | 61 --
.../META-INF/resources/app/views/requests.html | 129 -
.../resources/app/views/user-request-forms.html| 48
.../resources/app/views/user-requests.html | 2 +-
.../client/enduser/model/UserRequestWrapper.java | 46
.../enduser/resources/UserRequestsResource.java| 62 +++---
.../apache/syncope/common/lib/to/UserRequest.java | 20
.../core/flowable/api/UserRequestHandler.java | 9 ++
.../flowable/impl/FlowableUserRequestHandler.java | 48 ++--
.../syncope/core/logic/UserRequestLogic.java | 40 ---
.../rest/api/service/UserRequestService.java | 14 +++
.../rest/cxf/service/UserRequestServiceImpl.java | 5 +
25 files changed, 401 insertions(+), 411 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 47d64d6..a0e86de 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -62,7 +62,7 @@ under the License.
padding: 2%;
}
-#attribute {
+#attribute, #form-submit {
margin: auto;
max-width:480px;
padding: 10px;
@@ -379,6 +379,12 @@ div[role="tablist"] {
background-color: #f5f5f5;
border-color: #ddd;
}
+
+.search-box {
+ padding-bottom: 5px !important;
+ margin: 3%
+}
+
/* end default style
=
*/
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/templates/dark/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/templates/dark/editUser.css
index dd0d351..1a34f70 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/css/templates/dark/editUser.css
+++
b/client/enduser/src/main/resources/META-INF/resources/app/css/templates/dark/editUser.css
@@ -92,4 +92,4 @@ span.k-dropdown,
.card-header {
background-color: #49553e;
-}
\ No newline at end of file
+}
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 7122b50..7f124f5 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -145,7 +145,6 @@ under the License.
-
@@ -157,6 +156,7 @@ under the License.
+
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index f95093e..5b67897 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -237,16 +237,6 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
}]
}
})
-.state('update.userRequestForms', {
- url: '/user-request-forms',
- templateUrl: 'views/user-request-forms.html',
- resolve: {
-'authenticated': ['AuthService',
- function (AuthService) {
-return AuthService.islogged();
- }]
- }
-})
/* */
.state('update.finish', {
[syncope] branch master updated: [SYNCOPE-1476] fixes enum schema creation, final solution improving AbstractMultiPanel
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli 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 225e32f [SYNCOPE-1476] fixes enum schema creation, final solution
improving AbstractMultiPanel
225e32f is described below
commit 225e32f9244e70d4b3bef2fef29e412a01493aad
Author: Andrea Patricelli
AuthorDate: Tue Jun 4 17:10:35 2019 +0200
[SYNCOPE-1476] fixes enum schema creation, final solution improving
AbstractMultiPanel
---
.../client/ui/commons/markup/html/form/AbstractMultiPanel.java | 7 ++-
.../org/apache/syncope/client/console/panels/SchemaTypePanel.java | 3 ---
.../console/wicket/markup/html/bootstrap/dialog/BaseModal.java | 3 +--
.../org/apache/syncope/client/console/wizards/WizardMgtPanel.java | 6 --
.../org/apache/syncope/client/console/wizards/any/PlainAttrs.java | 6 --
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
index e042cbc..e4eb01a 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
@@ -59,7 +59,6 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel("innerForm");
form.setDefaultButton(null);
-form.setMultiPart(true);
container.add(form);
// ---
@@ -73,6 +72,12 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel setFormAsMultipart(final boolean
multipart) {
+form.setMultiPart(multipart);
+return this;
+}
+
private Fragment getNoDataFragment(final IModel> model, final
String label) {
final Fragment fragment = new Fragment("content", "noDataFragment",
AbstractMultiPanel.this);
fragment.add(new Label("field-label", new ResourceModel(label,
label)));
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
index ecdb870..ff20636 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
@@ -84,9 +84,6 @@ public class SchemaTypePanel extends
TypesDirectoryPanel extends
Modal {
return this;
}
-// SYNCOPE-1476
-public BaseModal setFormMultipart(final boolean multipart) {
+public BaseModal setFormAsMultipart(final boolean multipart) {
form.setMultiPart(multipart);
return this;
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index 33399fd..286260f 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -353,12 +353,6 @@ public abstract class WizardMgtPanel extends AbstractWiz
return this;
}
-// SYNCOPE-1476
-public WizardMgtPanel setFormAsMultipart(final boolean multipart) {
-this.modal.setFormMultipart(multipart);
-return this;
-}
-
/**
* Set window close callback for the given modal.
*
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 981842b..db02d27 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
@@ -442,6 +442,7 @@ public class PlainAttrs extends
AbstractAttrs {
}
});
} else {
+// SYNCOPE-1476 set form as multipart to properly
manage membership attributes
panel = new MultiFieldPanel.Builder<>(new
ListModel() {
private static final long serialVersionUID =
-1765231556272935141L;
@@ -452,7 +453,7 @@ public class PlainAttrs extends
AbstractAttrs {
}
}).build("pan
[syncope] branch 2_1_X updated: removed unuseful log in test
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new f47da71 removed unuseful log in test
f47da71 is described below
commit f47da71bee653b6e3620f8f0d2f214d0567f241e
Author: Andrea Patricelli
AuthorDate: Tue Jun 4 17:00:27 2019 +0200
removed unuseful log in test
---
.../java/org/apache/syncope/fit/console/AbstractTypesITCase.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
index bebb09a..21718f7 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
@@ -100,14 +100,9 @@ public abstract class AbstractTypesITCase extends
AbstractConsoleITCase {
+
"accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
formTester.setValue("content:form:view:details:key:textField", key);
formTester.setValue("content:form:view:details:type:dropDownChoiceField", "3");
-//Assertions.assertTrue(formTester.getForm().isMultiPart());
-
TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:0:"
+
"body:content:outerObjectsRepeater:0:outer:form:content:form:buttons:next",
Constants.ON_CLICK);
-LOG.info(">>>>>>>>>>>>>>>> {} - {} - {}",
TESTER.getLastResponseAsString(), TESTER.getLastResponse().
-getDocument(), TESTER.getLastRenderedPage());
-
formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+
"accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
formTester.submit("content:form:buttons:finish");
[syncope] branch 2_1_X updated: [SYNCOPE-1476] fixes enum schema creation, final solution improving AbstractMultiPanel
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new c1a8c04 [SYNCOPE-1476] fixes enum schema creation, final solution
improving AbstractMultiPanel
c1a8c04 is described below
commit c1a8c047595dd3a852574dcc848a14cf7426f9e7
Author: Andrea Patricelli
AuthorDate: Tue Jun 4 16:56:43 2019 +0200
[SYNCOPE-1476] fixes enum schema creation, final solution improving
AbstractMultiPanel
---
.../org/apache/syncope/client/console/panels/SchemaTypePanel.java | 3 ---
.../console/wicket/markup/html/bootstrap/dialog/BaseModal.java | 3 +--
.../client/console/wicket/markup/html/form/AbstractMultiPanel.java | 7 ++-
.../org/apache/syncope/client/console/wizards/WizardMgtPanel.java | 6 --
.../org/apache/syncope/client/console/wizards/any/PlainAttrs.java | 6 --
.../java/org/apache/syncope/fit/console/AbstractTypesITCase.java | 6 ++
6 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
index 3e3c508..620d255 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
@@ -86,9 +86,6 @@ public class SchemaTypePanel extends
TypesDirectoryPanel extends
Modal {
return this;
}
-// SYNCOPE-1476
-public BaseModal setFormMultipart(final boolean multipart) {
+public BaseModal setFormAsMultipart(final boolean multipart) {
form.setMultiPart(multipart);
return this;
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
index 0c06daa..44dcfbd 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
@@ -60,7 +60,6 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel("innerForm");
form.setDefaultButton(null);
-form.setMultiPart(true);
container.add(form);
// ---
@@ -74,6 +73,12 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel setFormAsMultipart(final boolean
multipart) {
+form.setMultiPart(multipart);
+return this;
+}
+
private Fragment getNoDataFragment(final IModel> model, final
String label) {
final Fragment fragment = new Fragment("content", "noDataFragment",
AbstractMultiPanel.this);
fragment.add(new Label("field-label", new ResourceModel(label,
label)));
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index 230d3cc..57b8226 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -353,12 +353,6 @@ public abstract class WizardMgtPanel extends Panel imple
return this;
}
-// SYNCOPE-1476
-public WizardMgtPanel setFormAsMultipart(final boolean multipart) {
-this.modal.setFormMultipart(multipart);
-return this;
-}
-
/**
* Set window close callback for the given modal.
*
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 804d5d9..1a7d61c 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -439,6 +439,7 @@ public class PlainAttrs extends
AbstractAttrs {
}
});
} else {
+// SYNCOPE-1476 set form as multipart to properly
manage membership attributes
panel = new MultiFieldPanel.Builder<>(new
ListModel() {
private static final long serialVersionUID =
-1765231556272935141L;
@@ -449,7 +450,7 @@ public class PlainAttrs extends
AbstractAttrs {
}
}).build("pan
[syncope] branch 2_0_X updated: removed unnecessary if statement
This is an automated email from the ASF dual-hosted git repository. andreapatricelli pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new 88c6bd6 removed unnecessary if statement 88c6bd6 is described below commit 88c6bd6af9685903648f2040b7d9312a24d39b76 Author: Andrea Patricelli AuthorDate: Tue Jun 4 11:11:05 2019 +0200 removed unnecessary if statement --- .../syncope/client/console/panels/SchemaTypePanel.java | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java index 91a995b..01ab5a3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java @@ -304,13 +304,11 @@ public class SchemaTypePanel extends TypesDirectoryPanel
[syncope] 02/02: default form layout info loaded by java object and not static string
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit a123eda1dc15f1d2087e3121ac28bd048328
Author: Andrea Patricelli
AuthorDate: Tue Jun 4 11:07:59 2019 +0200
default form layout info loaded by java object and not static string
---
.../apache/syncope/client/ui/commons/Constants.java| 7 ---
.../client/enduser/layout/FormLayoutInfoUtils.java | 18 +-
.../org/apache/syncope/client/enduser/pages/Self.java | 2 +-
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
index 1254ed0..579db02 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
@@ -103,13 +103,6 @@ public final class Constants {
public static final String NOTIFICATION_LEVEL_PARAM = "notificationLevel";
-public static final String DEFAULT_USER_FORM_LAYOUT_INFO = "{\n"
-+ "\"formClass\" :
\"org.apache.syncope.client.enduser.wizards.any.UserWizardBuilder\",\n"
-+ "\"auxClasses\" : true,\n" + "\"groups\" : true,\n" + "
\"plainAttrs\" : true,\n"
-+ "\"derAttrs\" : true,\n" + "\"virAttrs\" : true,\n" + "
\"resources\" : true,\n"
-+ "\"whichPlainAttrs\" : {},\n" + "\"whichDerAttrs\" :
{},\n" + "\"whichVirAttrs\" : {},\n"
-+ "\"passwordManagement\" : true\n" + " }";
-
public static Component getJEXLPopover(final Component caller, final
TooltipConfig.Placement placement) {
return getJEXLPopover(caller, placement, caller.getString("jexl_ex1"),
caller.getString("jexl_ex2"));
}
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/FormLayoutInfoUtils.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/FormLayoutInfoUtils.java
index f5517bb..283f0a0 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/FormLayoutInfoUtils.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/layout/FormLayoutInfoUtils.java
@@ -36,7 +36,23 @@ import org.apache.wicket.PageReference;
*/
public final class FormLayoutInfoUtils {
-private static final ObjectMapper MAPPER = new ObjectMapper();
+private static final ObjectMapper MAPPER;
+
+private static final String DEFAULT_USER_FORM_LAYOUT_INFO;
+
+static {
+MAPPER = new ObjectMapper();
+try {
+DEFAULT_USER_FORM_LAYOUT_INFO = MAPPER.writeValueAsString(new
UserFormLayoutInfo());
+} catch (IOException e) {
+throw new IllegalArgumentException("While generating default
enduser layout info for "
++ SyncopeEnduserSession.get().getSelfTO().getUsername(),
e);
+}
+}
+
+public static String getDefaultValue() {
+return DEFAULT_USER_FORM_LAYOUT_INFO;
+}
public static UserFormLayoutInfo fromJsonString(final String content) {
try {
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
index ca78a4d..bebdcfe 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/Self.java
@@ -98,7 +98,7 @@ public class Self extends BaseEnduserWebPage implements
IEventSource {
final String formLayoutConfParam = confParamOps.get(
SyncopeEnduserSession.get().getDomain(),
"enduser.form.layout.info",
-Constants.DEFAULT_USER_FORM_LAYOUT_INFO,
+FormLayoutInfoUtils.getDefaultValue(),
String.class);
userWizardBuilder = new UserWizardBuilder(
null,
