Repository: syncope Updated Branches: refs/heads/master 017909743 -> bdff1fd61
removed deprecated object from SyncopeEnduserSession, fixed complicance check Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bdff1fd6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bdff1fd6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bdff1fd6 Branch: refs/heads/master Commit: bdff1fd618955dd6a361385fcc8c620d75d34b5f Parents: 0179097 Author: Andrea Patricelli <andreapatrice...@apache.org> Authored: Fri Jun 23 13:23:50 2017 +0200 Committer: Andrea Patricelli <andreapatrice...@apache.org> Committed: Fri Jun 23 13:24:54 2017 +0200 ---------------------------------------------------------------------- .../syncope/client/enduser/SyncopeEnduserSession.java | 14 -------------- .../enduser/resources/UserSelfCreateResource.java | 3 ++- .../enduser/resources/UserSelfUpdateResource.java | 3 ++- 3 files changed, 4 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/bdff1fd6/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java index cd94d0c..370f91a 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java @@ -19,7 +19,6 @@ package org.apache.syncope.client.enduser; import java.security.AccessControlException; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -29,7 +28,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.tuple.Pair; import org.apache.cxf.jaxrs.client.WebClient; -import org.apache.syncope.client.enduser.model.CustomAttributesInfo; import org.apache.syncope.client.lib.AnonymousAuthenticationHandler; import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.common.lib.info.PlatformInfo; @@ -68,8 +66,6 @@ public class SyncopeEnduserSession extends WebSession { private final CookieUtils cookieUtils; - private final Map<String, CustomAttributesInfo> customForm; - private boolean xsrfTokenGenerated = false; public static SyncopeEnduserSession get() { @@ -96,7 +92,6 @@ public class SyncopeEnduserSession extends WebSession { return object.getType() == AttrSchemaType.Date; } }); - customForm = new HashMap<>(); } private void afterAuthentication() { @@ -203,13 +198,4 @@ public class SyncopeEnduserSession extends WebSession { this.xsrfTokenGenerated = xsrfTokenGenerated; } - public Map<String, CustomAttributesInfo> getCustomForm() { - return customForm; - } - - public void setCustomForm(final Map<String, CustomAttributesInfo> customForm) { - this.customForm.clear(); - this.customForm.putAll(customForm); - } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/bdff1fd6/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java index 7b2a834..66320f2 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java @@ -26,6 +26,7 @@ import javax.ws.rs.core.Response; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.SerializationUtils; +import org.apache.syncope.client.enduser.SyncopeEnduserApplication; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; import org.apache.syncope.client.enduser.SyncopeEnduserSession; import org.apache.syncope.client.enduser.annotations.Resource; @@ -84,7 +85,7 @@ public class UserSelfCreateResource extends BaseUserSelfResource { LOG.trace("Request is [{}]", userTO); // check if request is compliant with customization form rules - if (UserRequestValidator.compliant(userTO, SyncopeEnduserSession.get().getCustomForm(), true)) { + if (UserRequestValidator.compliant(userTO, SyncopeEnduserApplication.get().getCustomForm(), true)) { // 1. membership attributes management Set<AttrTO> membAttrs = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/bdff1fd6/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java index 1e8ede2..4aaa2f4 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java @@ -26,6 +26,7 @@ import javax.ws.rs.core.Response; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.SerializationUtils; +import org.apache.syncope.client.enduser.SyncopeEnduserApplication; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; import org.apache.syncope.client.enduser.SyncopeEnduserSession; import org.apache.syncope.client.enduser.annotations.Resource; @@ -67,7 +68,7 @@ public class UserSelfUpdateResource extends BaseUserSelfResource { UserTO userTO = MAPPER.readValue(request.getReader().readLine(), UserTO.class); // check if request is compliant with customization form rules - if (UserRequestValidator.compliant(userTO, SyncopeEnduserSession.get().getCustomForm(), false)) { + if (UserRequestValidator.compliant(userTO, SyncopeEnduserApplication.get().getCustomForm(), false)) { // 1. membership attributes management Set<AttrTO> membAttrs = new HashSet<>(); for (AttrTO attr : userTO.getPlainAttrs()) {
