From 9405b7ea6fb2f2794a882937da96cc76863cc0f1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 22 Sep 2022 19:20:23 +0200
Subject: [PATCH] Please cherry-pick: - registerBean is no longer used here
 (old, removed code) - baseUrl should never be NULL or empty -
 user.userContact must be valid

---
 .../user/FinancialsAdminUserSessionBean.java     |  6 ++++++
 .../model/user/FinancialsUserSessionBean.java    | 16 +++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
index 19b6eb3..f2fee3b 100644
--- a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
@@ -69,6 +69,12 @@ public class FinancialsAdminUserSessionBean extends BaseFinancialsEnterpriseBean
 		} else if (user.getUserId() != null) {
 			// Not allowed here
 			throw new IllegalStateException(MessageFormat.format("user.userId must be null, is: {0}", user.getUserId())); //NOI18N
+		} else if (null == user.getUserContact()) {
+			// Abort here
+			throw new NullPointerException("user.contact is null"); //NOI18N
+		} else if (user.getUserContact().getContactId() != null) {
+			// Not allowed here
+			throw new IllegalStateException(MessageFormat.format("user.userContact.contactId must be null, is: {0}", user.getUserId())); //NOI18N
 		}
 
 		// Check if user is registered
diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java
index 231ea0f..2e2d3e4 100644
--- a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java
@@ -20,7 +20,6 @@ import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import javax.ejb.EJB;
 import javax.ejb.EJBException;
 import javax.ejb.Stateless;
 import javax.persistence.Query;
@@ -39,7 +38,6 @@ import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
 import org.mxchange.jusercore.model.user.password_history.UserPasswordHistory;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote;
 
 /**
  * A user EJB
@@ -54,12 +52,6 @@ public class FinancialsUserSessionBean extends BaseFinancialsEnterpriseBean impl
 	 */
 	private static final long serialVersionUID = 542_145_347_916L;
 
-	/**
-	 * Registration EJB
-	 */
-	@EJB (lookup = "java:global/jfinancials-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote")
-	private UserRegistrationSessionBeanRemote registerBean;
-
 	/**
 	 * Default constructor
 	 */
@@ -92,6 +84,12 @@ public class FinancialsUserSessionBean extends BaseFinancialsEnterpriseBean impl
 		} else if (user.getUserConfirmKey() == null) {
 			// Throw NPE
 			throw new NullPointerException("user.userConfirmKey is null"); //NOI18N
+		} else if (null == baseUrl) {
+			// Throw NPE again
+			throw new NullPointerException("baseUrl is null"); //NOI18N
+		} else if (baseUrl.isEmpty()) {
+			// Throw IAE
+			throw new IllegalArgumentException("baseUrl is empty"); //NOI18N
 		}
 
 		// Update user account
@@ -359,7 +357,7 @@ public class FinancialsUserSessionBean extends BaseFinancialsEnterpriseBean impl
 		managedUser.setUserEntryUpdated(new Date());
 
 		// Create history entry
-		PasswordHistory entry = new UserPasswordHistory(user.getUserEncryptedPassword(), managedUser);
+		final PasswordHistory entry = new UserPasswordHistory(user.getUserEncryptedPassword(), managedUser);
 
 		// Set created timestamp
 		entry.setUserPasswordHistoryCreated(new Date());
-- 
2.39.5