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/16 14:44:42 UTC
[syncope] 03/03: Merge branch 'SYNCOPE-163-1' of
github.com:apache/syncope into SYNCOPE-163-1
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
commit 754f0cd14a3d8f465d0c9d3a7f8201e302b4f46c
Merge: 174f7b4 2c6ff17
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 16 18:13:56 2020 +0330
Merge branch 'SYNCOPE-163-1' of github.com:apache/syncope into SYNCOPE-163-1
# Conflicts:
# common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java
# core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
.../lib/access/AbstractAccessPolicyConf.java | 11 +++--
.../lib/attrs/AllowedAttrReleasePolicyConf.java | 12 ++++--
.../module/LDAPAuthenticationModuleConf.java | 14 ++++---
.../module/SAML2IdPAuthenticationModuleConf.java | 47 ++++++++++------------
.../policy/DefaultAuthenticationPolicyConf.java | 12 +++---
.../common/lib/to/client/OIDCRelyingPartyTO.java | 34 ++++++++--------
.../jpa/inner/AbstractClientAppTest.java | 4 +-
.../jpa/inner/AuthenticationModuleTest.java | 10 ++---
.../core/persistence/jpa/inner/PolicyTest.java | 14 +++----
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 2 +-
.../org/apache/syncope/fit/core/PolicyITCase.java | 6 +--
.../org/apache/syncope/fit/core/RealmITCase.java | 4 +-
12 files changed, 89 insertions(+), 81 deletions(-)
diff --cc common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java
index dc7ca42,e05669a..7537b7e
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java
@@@ -28,7 -29,8 +30,8 @@@ import javax.xml.bind.annotation.XmlEle
@XmlRootElement(name = "ldapAuthenticationModuleConf")
@XmlType
-public class LdapAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class LDAPAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+
private static final long serialVersionUID = -471527731042579422L;
protected String searchFilter;
diff --cc core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
index f043c2a,ac4896d..b757ca7
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
@@@ -120,8 -120,8 +120,8 @@@ public class AuthenticationModuleTest e
@Test
public void saveWithLdapModule() {
- LdapAuthenticationModuleConf conf = new LdapAuthenticationModuleConf();
+ LDAPAuthenticationModuleConf conf = new LDAPAuthenticationModuleConf();
- conf.setAttributes(List.of("cn", "uid"));
+ conf.getAttributes().addAll(List.of("cn", "uid"));
conf.setBaseDn("dc=example,dc=org");
conf.setSearchFilter("cn={user}");
conf.setSubtreeSearch(true);