From 1c25d6856f45fae563a7b6085bf7aa57c5b74793 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 2 Oct 2017 14:55:16 +0200
Subject: [PATCH] Email-based accounts under /users. /home only for POSIX-like
 accounts.

---
 .../cms/internal/kernel/HomeRepository.java   | 29 +++++++++++++------
 .../cms/internal/kernel/KernelConstants.java  |  1 +
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
index 574470398..bfcb940c1 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
@@ -1,6 +1,8 @@
 package org.argeo.cms.internal.kernel;
 
 import java.security.PrivilegedAction;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -27,12 +29,16 @@ import org.argeo.node.NodeUtils;
  * Make sure each user has a home directory available in the default workspace.
  */
 class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
+
 	/** The home base path. */
 	private String homeBasePath = KernelConstants.DEFAULT_HOME_BASE_PATH;
+	private String usersBasePath = KernelConstants.DEFAULT_USERS_BASE_PATH;
 	private String groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH;
 
 	private Set<String> checkedUsers = new HashSet<String>();
 
+	private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM");
+
 	public HomeRepository(Repository repository) {
 		super(repository);
 		putDescriptor(NodeConstants.CN, NodeConstants.HOME);
@@ -102,7 +108,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 		try {
 			Node userHome = NodeUtils.getUserHome(session, username);
 			if (userHome == null) {
-				String homePath = generateUserPath(homeBasePath, username);
+				String homePath = generateUserPath(username);
 				if (session.itemExists(homePath))// duplicate user id
 					userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
 				else
@@ -124,7 +130,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 	}
 
 	/** Generate path for a new user home */
-	private String generateUserPath(String base, String username) {
+	private String generateUserPath(String username) {
 		LdapName dn;
 		try {
 			dn = new LdapName(username);
@@ -133,15 +139,20 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 		}
 		String userId = dn.getRdn(dn.size() - 1).getValue().toString();
 		int atIndex = userId.indexOf('@');
-		if (atIndex > 0) {
-			String domain = userId.substring(0, atIndex);
-			String name = userId.substring(atIndex + 1);
-			return base + '/' + domain + '/' + name;
-		} else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
-			throw new CmsException("Unsupported username " + userId);
+		if (atIndex < 0) {
+			return homeBasePath + '/' + userId;
 		} else {
-			return base + '/' + userId;
+			return usersBasePath + '/' + usersDatePath.format(new Date()) + '/' + userId;
 		}
+		// if (atIndex > 0) {
+		// String domain = userId.substring(0, atIndex);
+		// String name = userId.substring(atIndex + 1);
+		// return base + '/' + domain + '/' + name;
+		// } else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
+		// throw new CmsException("Unsupported username " + userId);
+		// } else {
+		// return base + '/' + userId;
+		// }
 	}
 
 	public void createWorkgroup(LdapName dn) {
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
index efadde0ce..25e2f1d41 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
@@ -25,6 +25,7 @@ public interface KernelConstants {
 
 	// DEFAULTS JCR PATH
 	String DEFAULT_HOME_BASE_PATH = "/home";
+	String DEFAULT_USERS_BASE_PATH = "/users";
 	String DEFAULT_GROUPS_BASE_PATH = "/groups";
 
 	// RWT / RAP
-- 
2.30.2