You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2021/10/20 10:48:58 UTC

[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 <an...@apache.org>
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);