X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2Fnature%2FSimpleUserNatureMapper.java;h=56da470056de67ba5184548140fac8ce4f709bb2;hb=5bfc0d2e2e34f86b454a1ec209617a9fc0f306b1;hp=3bc4b51e11af15dd016e5a9635926a684b14f91c;hpb=b00a7e9898ea2819100290cab22bf614e23a3abf;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java
index 3bc4b51e1..56da47005 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.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;
@@ -7,30 +23,34 @@ import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
 
 public class SimpleUserNatureMapper implements UserNatureMapper {
+	public String getName() {
+		return "simpleUser";
+	}
 
 	public UserNature mapUserInfoFromContext(DirContextOperations ctx) {
-		SimpleUserNature basicUserInfo = new SimpleUserNature();
-		basicUserInfo.setLastName(ctx.getStringAttribute("sn"));
-		basicUserInfo.setFirstName(ctx.getStringAttribute("givenName"));
-		basicUserInfo.setEmail(ctx.getStringAttribute("mail"));
-		basicUserInfo.setUuid(ctx.getStringAttribute("seeAlso"));
-		return basicUserInfo;
+		SimpleUserNature nature = new SimpleUserNature();
+		nature.setLastName(ctx.getStringAttribute("sn"));
+		nature.setFirstName(ctx.getStringAttribute("givenName"));
+		nature.setEmail(ctx.getStringAttribute("mail"));
+		nature.setDescription(ctx.getStringAttribute("description"));
+		return nature;
 	}
 
 	public void mapUserInfoToContext(UserNature userInfoArg,
 			DirContextAdapter ctx) {
-		SimpleUserNature userInfo = (SimpleUserNature) userInfoArg;
-		ctx.setAttributeValue("cn", userInfo.getFirstName() + " "
-				+ userInfo.getLastName());
-		ctx.setAttributeValue("sn", userInfo.getLastName());
-		ctx.setAttributeValue("givenName", userInfo.getFirstName());
-		ctx.setAttributeValue("mail", userInfo.getEmail());
-		// TODO: find a cleaner way?
-		ctx.setAttributeValue("seeAlso", userInfo.getUuid());
+		SimpleUserNature nature = (SimpleUserNature) userInfoArg;
+		ctx.setAttributeValue("cn",
+				nature.getFirstName() + " " + nature.getLastName());
+		ctx.setAttributeValue("sn", nature.getLastName());
+		ctx.setAttributeValue("givenName", nature.getFirstName());
+		ctx.setAttributeValue("mail", nature.getEmail());
+		if (nature.getDescription() != null) {
+			ctx.setAttributeValue("description", nature.getDescription());
+		}
 	}
 
-	public Boolean supports(UserNature userInfo) {
-		return userInfo instanceof SimpleUserNature;
+	public Boolean supports(UserNature userNature) {
+		return userNature instanceof SimpleUserNature;
 	}
 
 }