X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FDefaultSecurityService.java;h=e005e1ad4fac8bcb794417a56322c25381141078;hb=136dab5338b5f731b285d17c804861bd5e5a9b5c;hp=e9718035148db27b8f3aafd706fdc07516664ebd;hpb=814f2e01731aca304d826d070922d51fd84efa29;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
index e97180351..e005e1ad4 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
@@ -17,7 +17,8 @@
 package org.argeo.security.core;
 
 import java.util.Iterator;
-import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.argeo.ArgeoException;
 import org.argeo.security.ArgeoSecurity;
@@ -25,6 +26,7 @@ import org.argeo.security.ArgeoSecurityDao;
 import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
 import org.argeo.security.SimpleArgeoUser;
+import org.argeo.security.UserNature;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.security.Authentication;
@@ -59,8 +61,8 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 	public void updateUserPassword(String username, String password) {
 		SimpleArgeoUser user = new SimpleArgeoUser(
 				securityDao.getUser(username));
-		user.setPassword(password);
-		securityDao.update(user);
+		user.setPassword(securityDao.encodePassword(password));
+		securityDao.updateUser(user);
 	}
 
 	public void updateCurrentUserPassword(String oldPassword, String newPassword) {
@@ -68,21 +70,50 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 		if (!securityDao.isPasswordValid(user.getPassword(), oldPassword))
 			throw new ArgeoException("Old password is not correct.");
 		user.setPassword(securityDao.encodePassword(newPassword));
-		securityDao.update(user);
+		securityDao.updateUser(user);
 	}
 
 	public void newUser(ArgeoUser user) {
-		user.getUserNatures().clear();
 		argeoSecurity.beforeCreate(user);
-		securityDao.create(user);
+		// normalize password
+		if (user instanceof SimpleArgeoUser) {
+			if (user.getPassword() == null || user.getPassword().equals(""))
+				((SimpleArgeoUser) user).setPassword(securityDao
+						.encodePassword(user.getUsername()));
+			else if (!user.getPassword().startsWith("{"))
+				((SimpleArgeoUser) user).setPassword(securityDao
+						.encodePassword(user.getPassword()));
+		}
+		securityDao.createUser(user);
+	}
+
+	public ArgeoUser getUser(String username) {
+		return securityDao.getUser(username);
+	}
+
+	public Boolean userExists(String username) {
+		return securityDao.userExists(username);
 	}
 
 	public void updateUser(ArgeoUser user) {
-		String password = securityDao.getUserWithPassword(user.getUsername())
-				.getPassword();
+		String password = user.getPassword();
+		if (password == null)
+			password = securityDao.getUserWithPassword(user.getUsername())
+					.getPassword();
+		if (!password.startsWith("{"))
+			password = securityDao.encodePassword(user.getPassword());
 		SimpleArgeoUser simpleArgeoUser = new SimpleArgeoUser(user);
 		simpleArgeoUser.setPassword(password);
-		securityDao.update(simpleArgeoUser);
+		securityDao.updateUser(simpleArgeoUser);
+	}
+
+	public void deleteUser(String username) {
+		securityDao.deleteUser(username);
+
+	}
+
+	public void deleteRole(String role) {
+		securityDao.deleteRole(role);
 	}
 
 	public TaskExecutor createSystemAuthenticatedTaskExecutor() {
@@ -118,8 +149,8 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 		};
 	}
 
-	public List<ArgeoUser> listUsersInRole(String role) {
-		List<ArgeoUser> lst = securityDao.listUsersInRole(role);
+	public Set<ArgeoUser> listUsersInRole(String role) {
+		Set<ArgeoUser> lst = securityDao.listUsersInRole(role);
 		Iterator<ArgeoUser> it = lst.iterator();
 		while (it.hasNext()) {
 			if (it.next().getUsername()
@@ -131,6 +162,20 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 		return lst;
 	}
 
+	public void updateCurrentUserNatures(Map<String, UserNature> userNatures) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public Set<ArgeoUser> listUsers() {
+		return securityDao.listUsers();
+	}
+
+	public Set<String> listEditableRoles() {
+		// TODO Auto-generated method stub
+		return securityDao.listEditableRoles();
+	}
+
 	public void setArgeoSecurity(ArgeoSecurity argeoSecurity) {
 		this.argeoSecurity = argeoSecurity;
 	}