From cdfa57d1d8cbba8607099b214eb74a3c1249e2b0 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 22 Feb 2021 16:00:22 +0100
Subject: [PATCH] [New] Added new PrivilegeAddUserAndSetPasswordCommand

---
 ...PrivilegeAddUserAndSetPasswordCommand.java | 32 +++++++++++++++++++
 .../users/PrivilegeAddUserCommand.java        | 20 ++++++------
 2 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java

diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java
new file mode 100644
index 000000000..0baf49be0
--- /dev/null
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java
@@ -0,0 +1,32 @@
+package li.strolch.service.privilege.users;
+
+import li.strolch.persistence.api.StrolchTransaction;
+import li.strolch.privilege.handler.PrivilegeHandler;
+import li.strolch.utils.dbc.DBC;
+
+public class PrivilegeAddUserAndSetPasswordCommand extends PrivilegeAddUserCommand {
+
+	private char[] password;
+
+	public PrivilegeAddUserAndSetPasswordCommand(StrolchTransaction tx) {
+		super(tx);
+	}
+
+	public void setPassword(char[] password) {
+		this.password = password;
+	}
+
+	@Override
+	public void validate() {
+		super.validate();
+		DBC.PRE.assertNotNull("password may not be null!", this.password);
+	}
+
+	@Override
+	public void doCommand() {
+		PrivilegeHandler privilegeHandler = getContainer().getPrivilegeHandler().getPrivilegeHandler();
+		this.userOut = privilegeHandler.addUser(this.cert, this.userIn, this.password);
+		privilegeHandler.persist(this.cert);
+		writeAudit();
+	}
+}
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
index 12728d4d9..333a12f0e 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
@@ -1,6 +1,5 @@
 package li.strolch.service.privilege.users;
 
-import li.strolch.agent.api.ComponentContainer;
 import li.strolch.model.audit.AccessType;
 import li.strolch.model.audit.Audit;
 import li.strolch.persistence.api.StrolchTransaction;
@@ -17,17 +16,17 @@ import li.strolch.utils.dbc.DBC;
 public class PrivilegeAddUserCommand extends Command {
 
 	// input
-	private UserRep userIn;
-	private Certificate cert;
+	protected UserRep userIn;
+	protected Certificate cert;
 
 	// intermediary
-	private Audit audit;
+	protected Audit audit;
 
 	// output
-	private UserRep userOut;
+	protected UserRep userOut;
 
-	public PrivilegeAddUserCommand(ComponentContainer container, StrolchTransaction tx) {
-		super(container, tx);
+	public PrivilegeAddUserCommand(StrolchTransaction tx) {
+		super(tx);
 	}
 
 	public void setUserIn(UserRep userIn) {
@@ -51,14 +50,14 @@ public class PrivilegeAddUserCommand extends Command {
 
 	@Override
 	public void doCommand() {
-
 		PrivilegeHandler privilegeHandler = getContainer().getPrivilegeHandler().getPrivilegeHandler();
-
 		this.userOut = privilegeHandler.addUser(this.cert, this.userIn, null);
 		privilegeHandler.persist(this.cert);
+		writeAudit();
+	}
 
+	protected void writeAudit() {
 		tx().setSuppressAuditsForAudits(true);
-
 		this.audit = tx()
 				.auditFrom(AccessType.CREATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
 						this.userOut.getUsername());
@@ -67,7 +66,6 @@ public class PrivilegeAddUserCommand extends Command {
 
 	@Override
 	public void undo() {
-
 		if (tx().isRollingBack()) {
 			PrivilegeHandler privilegeHandler = getContainer().getPrivilegeHandler().getPrivilegeHandler();