You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/17 11:53:58 UTC

[syncope] branch SYNCOPE-163-1 updated: SYNCOPE-160: remove attrs from module in favor of profile

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

mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
     new 228372e  SYNCOPE-160: remove attrs from module in favor of profile
228372e is described below

commit 228372e1ec0499e3f6d9e12e49ce138b9842ddc0
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Tue Mar 17 15:23:42 2020 +0330

    SYNCOPE-160: remove attrs from module in favor of profile
---
 .../lib/authentication/module/LDAPAuthModuleConf.java  | 18 ------------------
 .../core/persistence/jpa/inner/AuthModuleTest.java     |  1 -
 2 files changed, 19 deletions(-)

diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
index ca69e68..680854b 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
@@ -18,13 +18,8 @@
  */
 package org.apache.syncope.common.lib.authentication.module;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 
 @XmlRootElement(name = "ldapAuthModuleConf")
 @XmlType
@@ -35,12 +30,6 @@ public class LDAPAuthModuleConf extends AbstractAuthModuleConf {
     protected String searchFilter;
 
     /**
-     * List of attributes to fetch from LDAP
-     * for the user.
-     */
-    private final List<String> attributes = new ArrayList<>(0);
-
-    /**
      * The attribute value that should be used
      * for the authenticated username, upon a successful authentication
      * attempt.
@@ -94,13 +83,6 @@ public class LDAPAuthModuleConf extends AbstractAuthModuleConf {
         this.baseDn = baseDn;
     }
 
-    @XmlElementWrapper(name = "attributes")
-    @XmlElement(name = "attribute")
-    @JsonProperty("attributes")
-    public List<String> getAttributes() {
-        return attributes;
-    }
-
     public String getUserIdAttribute() {
         return userIdAttribute;
     }
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
index 2f641fb..2c67043 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
@@ -120,7 +120,6 @@ public class AuthModuleTest extends AbstractTest {
     @Test
     public void saveWithLdapModule() {
         LDAPAuthModuleConf conf = new LDAPAuthModuleConf();
-        conf.getAttributes().addAll(List.of("cn", "uid"));
         conf.setBaseDn("dc=example,dc=org");
         conf.setSearchFilter("cn={user}");
         conf.setSubtreeSearch(true);