From 2f80b11692d131157c28db1e01dd5115669f3f6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../user/AddressbookAdminUserSessionBean.java | 6 ++++++ .../model/user/AddressbookUserSessionBean.java | 16 +++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java index c613b19..85e5dc5 100644 --- a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java @@ -69,6 +69,12 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookEnterpriseBe } 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/AddressbookUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java index 4eed341..ea279c9 100644 --- a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.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; @@ -40,7 +39,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 @@ -55,12 +53,6 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im */ private static final long serialVersionUID = 542_145_347_916L; - /** - * Registration EJB - */ - @EJB (lookup = "java:global/addressbook-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote") - private UserRegistrationSessionBeanRemote registerBean; - /** * Default constructor */ @@ -93,6 +85,12 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im } 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 @@ -360,7 +358,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im managedUser.setUserUpdated(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