Adapt security for JSP UI, breaks RIA UI (user natures collection)

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / ldap / nature / CoworkerUserNatureMapper.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java
index 0ea573ccbbac5549fa10924096687d1d3ced111f..761d1186cc40f8eb0979214e7d1f9c101e3049f4 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed 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.argeo.security.ldap.nature;
 
 import org.argeo.security.UserNature;
@@ -8,14 +24,16 @@ import org.springframework.ldap.core.DirContextOperations;
 
 public class CoworkerUserNatureMapper implements UserNatureMapper {
 
+       public String getName() {
+               return "coworker";
+       }
+
        public UserNature mapUserInfoFromContext(DirContextOperations ctx) {
                CoworkerNature nature = new CoworkerNature();
-               nature.setDescription(ctx.getStringAttribute("description"));
                nature.setMobile(ctx.getStringAttribute("mobile"));
                nature.setTelephoneNumber(ctx.getStringAttribute("telephoneNumber"));
 
-               if (nature.getDescription() == null && nature.getMobile() == null
-                               && nature.getTelephoneNumber() == null)
+               if (nature.getMobile() == null && nature.getTelephoneNumber() == null)
                        return null;
                else
                        return nature;
@@ -24,16 +42,13 @@ public class CoworkerUserNatureMapper implements UserNatureMapper {
        public void mapUserInfoToContext(UserNature userInfoArg,
                        DirContextAdapter ctx) {
                CoworkerNature nature = (CoworkerNature) userInfoArg;
-               if (nature.getDescription() != null) {
-                       ctx.setAttributeValue("description", nature.getDescription());
-               }
                if (nature.getMobile() == null || !nature.getMobile().equals("")) {
                        ctx.setAttributeValue("mobile", nature.getMobile());
                }
                if (nature.getTelephoneNumber() == null
                                || !nature.getTelephoneNumber().equals("")) {
-                       ctx.setAttributeValue("telephoneNumber", nature
-                                       .getTelephoneNumber());
+                       ctx.setAttributeValue("telephoneNumber",
+                                       nature.getTelephoneNumber());
                }
        }