create migration workflow and make scope configurable

bwreg-service/src/main/java/edu/kit/scc/nextcloud/NextcloudWorker.java

@@ -65,9 +65,9 @@ public class NextcloudWorker {
 		this.auditor = auditor;
 		
 		try {
-			apiUrl = prop.readProp("api_url");
-			apiUsername = prop.readProp("api_username");
-			apiPassword = prop.readProp("api_password");
+			apiUrl = prop.readProp("nc_api_url");
+			apiUsername = prop.readProp("nc_api_username");
+			apiPassword = prop.readProp("nc_api_password");
 		} catch (PropertyReaderException e) {
 			throw new RegisterException(e);
 		}

bwreg-service/src/main/java/edu/kit/scc/syncshare/reg/NextcloudProxyIdpRegisterWorkflow.java

@@ -66,8 +66,25 @@ public class NextcloudProxyIdpRegisterWorkflow  implements RegisterUserWorkflow,
 	public void registerUser(UserEntity user, ServiceEntity service, RegistryEntity registry, Auditor auditor)
 			throws RegisterException {
 		
-		updateRegistry(user, service, registry, auditor);
-		reconciliation(user, service, registry, auditor);
+		PropertyReader prop = PropertyReader.newRegisterPropReader(service);
+		String idKey = "nextcloud_user_id";
+		if (prop.readPropOrNull("id_key") != null) {
+			idKey = prop.readPropOrNull("id_key");
+		}
+
+		String scope = "bwidm.scc.kit.edu";
+		if (prop.readPropOrNull("id_scope") != null) {
+			idKey = prop.readPropOrNull("id_scope");
+		}
+
+		if (! user.getGenericStore().containsKey(idKey)) {
+			user.getGenericStore().put(idKey, UUID.randomUUID().toString() + "@" + scope);
+			logger.debug("Generating new {} for user {}: {}", idKey, user.getId(), user.getGenericStore().get(idKey));
+		}
+
+		if (! registry.getRegistryValues().containsKey("id")) {
+			registry.getRegistryValues().put("id", user.getGenericStore().get(idKey));
+		}
 	}
 
 	@Override
@@ -85,21 +102,6 @@ public class NextcloudProxyIdpRegisterWorkflow  implements RegisterUserWorkflow,
 	@Override
 	public Boolean updateRegistry(UserEntity user, ServiceEntity service, RegistryEntity registry, Auditor auditor)
 			throws RegisterException {
-
-		PropertyReader prop = PropertyReader.newRegisterPropReader(service);
-		String idKey = "nextcloud_user_id";
-		if (prop.readPropOrNull("id_key") != null) {
-			idKey = prop.readPropOrNull("id_key");
-		}
-
-		if (! user.getGenericStore().containsKey(idKey)) {
-			user.getGenericStore().put(idKey, UUID.randomUUID().toString() + "@bwidm.de");
-		}
-
-		if (! registry.getRegistryValues().containsKey("id")) {
-			registry.getRegistryValues().put("id", user.getGenericStore().get(idKey));
-		}
-
 		return false;
 	}
 }

bwreg-service/src/main/java/edu/kit/scc/syncshare/reg/PfNcMigrationRegisterWorkflow.java

+package edu.kit.scc.syncshare.reg;
+
+import java.util.UUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import edu.kit.scc.nextcloud.NextcloudAnswer;
+import edu.kit.scc.nextcloud.NextcloudWorker;
+import edu.kit.scc.webreg.audit.Auditor;
+import edu.kit.scc.webreg.entity.RegistryEntity;
+import edu.kit.scc.webreg.entity.ServiceEntity;
+import edu.kit.scc.webreg.entity.UserEntity;
+import edu.kit.scc.webreg.exc.RegisterException;
+import edu.kit.scc.webreg.service.reg.Infotainment;
+import edu.kit.scc.webreg.service.reg.InfotainmentCapable;
+import edu.kit.scc.webreg.service.reg.InfotainmentTreeNode;
+import edu.kit.scc.webreg.service.reg.RegisterUserWorkflow;
+import edu.kit.scc.webreg.service.reg.ldap.PropertyReader;
+
+public class PfNcMigrationRegisterWorkflow extends PowerFolderRegisterWorkflow 
+	implements RegisterUserWorkflow, InfotainmentCapable  {
+
+	private static final Logger logger = LoggerFactory.getLogger(PfNcMigrationRegisterWorkflow.class);
+
+	@Override
+	public void registerUser(UserEntity user, ServiceEntity service,
+			RegistryEntity registry, Auditor auditor) throws RegisterException {
+		
+		super.registerUser(user, service, registry, auditor);
+		
+		PropertyReader prop = PropertyReader.newRegisterPropReader(service);
+		String idKey = "nextcloud_user_id";
+		if (prop.readPropOrNull("id_key") != null) {
+			idKey = prop.readPropOrNull("id_key");
+		}
+
+		String scope = "bwidm.scc.kit.edu";
+		if (prop.readPropOrNull("id_scope") != null) {
+			idKey = prop.readPropOrNull("id_scope");
+		}
+
+		if (! user.getGenericStore().containsKey(idKey)) {
+			user.getGenericStore().put(idKey, UUID.randomUUID().toString() + "@" + scope);
+			logger.debug("Generating new {} for user {}: {}", idKey, user.getId(), user.getGenericStore().get(idKey));
+		}
+
+		if (! registry.getRegistryValues().containsKey("id")) {
+			registry.getRegistryValues().put("id", user.getGenericStore().get(idKey));
+		}
+	}
+	
+	@Override
+	public void reconciliation(UserEntity user, ServiceEntity service,
+			RegistryEntity registry, Auditor auditor) throws RegisterException {
+		
+		super.reconciliation(user, service, registry, auditor);
+		
+		PropertyReader prop = PropertyReader.newRegisterPropReader(service);
+		String idKey = "nextcloud_user_id";
+		if (prop.readPropOrNull("id_key") != null) {
+			idKey = prop.readPropOrNull("id_key");
+		}
+
+		String scope = "bwidm.scc.kit.edu";
+		if (prop.readPropOrNull("id_scope") != null) {
+			idKey = prop.readPropOrNull("id_scope");
+		}
+
+		if (! user.getGenericStore().containsKey(idKey)) {
+			user.getGenericStore().put(idKey, UUID.randomUUID().toString() + "@" + scope);
+			logger.debug("Generating new {} for user {}: {}", idKey, user.getId(), user.getGenericStore().get(idKey));
+		}
+
+		if (! registry.getRegistryValues().containsKey("id")) {
+			registry.getRegistryValues().put("id", user.getGenericStore().get(idKey));
+		}
+	}
+
+	@Override
+	public Infotainment getInfo(RegistryEntity registry, UserEntity user, ServiceEntity service) throws RegisterException {
+		
+		Infotainment info = super.getInfo(registry, user, service);
+		
+		PropertyReader prop = PropertyReader.newRegisterPropReader(service);
+		NextcloudWorker worker = new NextcloudWorker(prop);
+		
+		NextcloudAnswer answer = worker.loadAccount(registry);
+
+		
+		InfotainmentTreeNode root = info.getRoot();
+
+		/*
+		InfotainmentTreeNode node = new InfotainmentTreeNode("Status", root);
+		new InfotainmentTreeNode("StatusCode", "" + answer.getMeta().getStatusCode(), node);
+		new InfotainmentTreeNode("Status", answer.getMeta().getStatus(), node);
+		new InfotainmentTreeNode("Message", answer.getMeta().getMessage(), node);
+		 */
+		
+		InfotainmentTreeNode node = new InfotainmentTreeNode("Migration User Info", root);
+		if ((answer.getUser() != null) && (answer.getUser().getId() != null)) {
+			new InfotainmentTreeNode("ID", answer.getUser().getId(), node);
+			new InfotainmentTreeNode("Name", answer.getUser().getDisplayName(), node);
+			new InfotainmentTreeNode("E-Mail", answer.getUser().getEmail(), node);
+			if (answer.getUser().getQuota() != null && answer.getUser().getQuota().getRelative() != null) {
+				new InfotainmentTreeNode("Verbrauchter Platz", "" +  answer.getUser().getQuota().getRelative() + "%", node);
+			}
+			if (answer.getUser().getGroups() != null) {
+				for (String group : answer.getUser().getGroups().getGroupList()) {
+					new InfotainmentTreeNode("Gruppe", group, node);
+				}
+			}
+		} else {
+			new InfotainmentTreeNode("status", "Account not initialized yet", node);
+		}
+
+		return info;
+
+	}
+}