X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fuser%2FJobsAdminUserWebRequestBean.java;h=39db1e8dd492ce4250700231b42d071f6ff37549;hb=cb27495f81d21c2db808536609900ffd957c30f9;hp=b47737248bea24d44fb971e8dd7aa4f8875554ec;hpb=eba802ce5410f66f5f8d73de1d69e89c562df7de;p=jjobs-war.git diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index b4773724..39db1e8d 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -17,31 +17,28 @@ package org.mxchange.jjobs.beans.user; import java.text.MessageFormat; +import java.util.Locale; import java.util.Objects; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; import javax.faces.FacesException; +import javax.faces.context.FacesContext; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; -import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestHelperController; -import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; +import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; +import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; import org.mxchange.jusercore.events.user.delete.AdminDeletedUserEvent; import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; -import org.mxchange.jusercore.events.user.helper.created.ObservableHelperCreatedUserEvent; import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; @@ -74,7 +71,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("adminUserController") @RequestScoped -public class JobsAdminUserWebRequestBean extends BaseJobsController implements JobsAdminUserWebRequestController { +public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdminUserWebRequestController { /** * Serial number @@ -97,19 +94,19 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J /** * Administrative user EJB */ + @EJB (lookup = "java:global/jjobs-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote") private AdminUserSessionBeanRemote adminUserBean; /** - * Bean helper + * Contact instance */ - @Inject - private JobsWebRequestHelperController beanHelper; + private Contact contact; /** * Regular contact controller */ @Inject - private JobsContactWebSessionController contactController; + private JobsContactWebRequestController contactController; /** * Event being fired when admin has deleted user @@ -131,16 +128,22 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J @Any private Event updatedUserDataEvent; + /** + * User instance + */ + private User user; + /** * General user EJB */ + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** * Regular user controller */ @Inject - private JobsUserWebSessionController userController; + private JobsUserWebRequestController userController; /** * Delete reason @@ -210,9 +213,6 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J * @return Redirect outcome */ public String addUser () { - // Get contact from bean helper to "cache" it locally - Contact contact = this.beanHelper.getContact(); - // As the form cannot validate the data (required="true"), check it here if (this.getUserName() == null) { // Throw NPE @@ -220,47 +220,50 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } else if (this.getUserName().isEmpty()) { // Is empty throw new IllegalArgumentException("userName is null"); //NOI18N - } else if (contact == null) { + } else if (this.getContact() == null) { // No contact instance set, so test required fields: gender, first name and family name this.adminContactController.validateContactData(); } // Create new user instance - User user = new LoginUser(); + final User newUser = new LoginUser(); // Set user name, CONFIRMED and INVISIBLE - user.setUserName(this.getUserName()); - user.setUserMustChangePassword(this.getUserMustChangePassword()); - user.setUserAccountStatus(UserAccountStatus.CONFIRMED); - user.setUserProfileMode(ProfileMode.INVISIBLE); + newUser.setUserName(this.getUserName()); + newUser.setUserMustChangePassword(this.getUserMustChangePassword()); + newUser.setUserAccountStatus(UserAccountStatus.CONFIRMED); + newUser.setUserProfileMode(ProfileMode.INVISIBLE); + + // Get locale from view-root + final Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale(); // Copy user locale - user.setUserLocale(this.localizationController.getLocale()); + newUser.setUserLocale(locale); // Init instance Contact userContact; // Is a contact instance in helper set? - if (contact instanceof Contact) { + if (this.getContact() instanceof Contact) { // Then use it for contact linking - userContact = contact; + userContact = this.getContact(); } else { // Create contact instance userContact = this.contactController.createContactInstance(); } // Set contact in user - user.setUserContact(userContact); + newUser.setUserContact(userContact); // Init variable for password String password = null; // Is the user name or email address used already? // @TODO Add password length check - if (this.userController.isUserNameRegistered(user)) { + if (this.userController.isUserNameRegistered(newUser)) { // User name is already used - throw new FaceletException(new UserNameAlreadyRegisteredException(user)); - } else if ((contact == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) { + throw new FaceletException(new UserNameAlreadyRegisteredException(newUser)); + } else if ((this.getContact() == null) && (this.contactController.isEmailAddressRegistered(newUser.getUserContact()))) { // Email address is already used this.showFacesMessage("admin_add_user:emailAddress", "ERROR_EMAIL_ADDRESS_ALREADY_USED"); //NOI18N @@ -272,10 +275,10 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J return ""; //NOI18N } else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) { // Empty password entered, then generate one - password = UserLoginUtils.createRandomPassword(JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH); + password = UserLoginUtils.createRandomPassword(JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH); } else if (!this.isSamePasswordEntered()) { // Both passwords don't match - throw new FaceletException(new UserPasswordRepeatMismatchException(user)); + throw new FaceletException(new UserPasswordRepeatMismatchException(newUser)); } else { // Both match, so get it from this bean password = this.getUserPassword(); @@ -283,22 +286,22 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J // The password should not be null and at least 5 characters long assert (password != null) : "password is null"; //NOI18N - assert (password.length() >= JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N + assert (password.length() >= JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N // Encrypt password and set it - user.setUserEncryptedPassword(UserLoginUtils.encryptPassword(password)); + newUser.setUserEncryptedPassword(UserLoginUtils.encryptPassword(password)); try { // Now, that all is set, call EJB - if (contact instanceof Contact) { + if (this.getContact() instanceof Contact) { // Link contact with this user - User updatedUser = this.adminUserBean.linkUser(user); + final User updatedUser = this.adminUserBean.linkUser(newUser); // Fire event this.userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser)); } else { // Add new contact - User updatedUser = this.adminUserBean.addUser(user); + final User updatedUser = this.adminUserBean.addUser(newUser); // Fire event this.addedUserEvent.fire(new AdminAddedUserEvent(updatedUser)); @@ -309,7 +312,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Clear helper - this.beanHelper.setContact(null); + this.setContact(null); // Clear this bean this.clear(); @@ -325,7 +328,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J *

* @param event User created event */ - public void afterHelperCreatedUserEvent (@Observes final ObservableHelperCreatedUserEvent event) { + public void afterCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) { // Is the instance valid? if (null == event) { // Throw NPE @@ -341,12 +344,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J throw new NullPointerException(MessageFormat.format("event.createdUser.userId={0} is not valid", event.getCreatedUser().getUserId())); //NOI18N } - // Get user instance - User user = event.getCreatedUser(); - - // Set all fields here - this.setUserName(user.getUserName()); - this.setUserLockReason(user.getUserLastLockedReason()); + // Set whole user + this.setUser(event.getCreatedUser()); } /** @@ -371,7 +370,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Get user instance - User registeredUser = event.getRegisteredUser(); + final User registeredUser = event.getRegisteredUser(); // @TODO Nothing to do with the user here? // Clear all data @@ -384,31 +383,28 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J * @return Redirect outcome */ public String deleteUserData () { - // Get user instance into local variable - User user = this.beanHelper.getUser(); - // Is the user instance valid and CONFIRMED? - if (null == user) { + if (this.getUser() == null) { // Throw NPE throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { + } else if (this.getUser().getUserId() == null) { // Throw again throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { + } else if (this.getUser().getUserId() < 1) { // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", this.getUser().getUserId())); //NOI18N } try { // All fine, delete it - this.adminUserBean.deleteUser(user, this.getUserDeleteReason()); + this.adminUserBean.deleteUser(this.getUser(), this.getUserDeleteReason()); } catch (final UserNotFoundException ex) { // Should not happen, so throw again throw new FaceletException(ex); } // Fire event - this.deleteUserEvent.fire(new AdminDeletedUserEvent(user, this.getUserDeleteReason())); + this.deleteUserEvent.fire(new AdminDeletedUserEvent(this.getUser(), this.getUserDeleteReason())); // Redirect return "admin_list_user"; //NOI18N @@ -420,22 +416,19 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J * @return Redirect outcome */ public String editUserData () { - // Get user instance - User user = this.beanHelper.getUser(); - // Null password means not setting it String encryptedPassword = null; // Check if user instance is in helper and valid - if (null == user) { + if (this.getUser() == null) { // Throw NPE throw new NullPointerException("beanHelper.user is null"); //NOI18N - } else if (user.getUserId() == null) { + } else if (this.getUser().getUserId() == null) { // Throw NPE again throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { + } else if (this.getUser().getUserId() < 1) { // Invalid id - throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N + throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", this.getUser().getUserId())); //NOI18N } else if (this.getUserName() == null) { // Not all required fields are set throw new NullPointerException("this.userName is null"); //NOI18N @@ -450,7 +443,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J // Not same password entered this.showFacesMessage("form_edit_user:userPassword", "ADMIN_USER_PASSWORD_REPEAT_DIFFERENT"); //NOI18N return ""; //NOI18N - } else if ((!Objects.equals(user.getUserName(), this.getUserName())) && (this.userBean.ifUserNameExists(this.getUserName()))) { + } else if ((!Objects.equals(this.getUser().getUserName(), this.getUserName())) && (this.userBean.ifUserNameExists(this.getUserName()))) { // Clear all fields this.clear(); @@ -459,7 +452,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J return ""; //NOI18N } else if (this.isSamePasswordEntered()) { // Same password entered, create container - if ((Objects.equals(user.getUserMustChangePassword(), this.getUserMustChangePassword())) && (UserLoginUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword())))) { + if ((Objects.equals(this.getUser().getUserMustChangePassword(), this.getUserMustChangePassword())) && (UserLoginUtils.ifPasswordMatches(new UserLoginContainer(this.getUser(), this.getUserPassword())))) { // Clear password fields this.setUserPassword(null); this.setUserPasswordRepeat(null); @@ -474,17 +467,17 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Set user name and flag - user.setUserName(this.getUserName()); - user.setUserMustChangePassword(this.getUserMustChangePassword()); + this.getUser().setUserName(this.getUserName()); + this.getUser().setUserMustChangePassword(this.getUserMustChangePassword()); // Is a password set? if (encryptedPassword != null) { // Set it as well - user.setUserEncryptedPassword(encryptedPassword); + this.getUser().setUserEncryptedPassword(encryptedPassword); } // Call EJB for updating user data - User updatedUser = this.userBean.updateUserData(user); + final User updatedUser = this.userBean.updateUserData(this.getUser()); // Fire event this.updatedUserDataEvent.fire(new AdminUpdatedUserDataEvent(updatedUser)); @@ -493,6 +486,42 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J return "admin_list_user"; //NOI18N } + /** + * Getter for contact instance + *

+ * @return Contact instance + */ + public Contact getContact () { + return this.contact; + } + + /** + * Setter for contact instance + *

+ * @param contact Contact instance + */ + public void setContact (final Contact contact) { + this.contact = contact; + } + + /** + * Getter for user instance + *

+ * @return User instance + */ + public User getUser () { + return this.user; + } + + /** + * Setter for user instance + *

+ * @param user User instance + */ + public void setUser (final User user) { + this.user = user; + } + /** * Getter for user delete reason *

@@ -601,25 +630,6 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J this.userPasswordRepeat = userPasswordRepeat; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - /** * Locks selected user's account. This method makes sure that a lock reason * is provided that th user later can read on login attempts. @@ -627,25 +637,22 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J * @return Redirect outcome */ public String lockUserAccount () { - // Get user instance - User user = this.beanHelper.getUser(); - // Is the user instance valid and CONFIRMED? - if (null == user) { + if (this.getUser() == null) { // Throw NPE - throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { + throw new NullPointerException("this.user is null"); //NOI18N + } else if (this.getUser().getUserId() == null) { // Throw again - throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { + throw new NullPointerException("this.user.userId is null"); //NOI18N + } else if (this.getUser().getUserId() < 1) { // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N - } else if (user.getUserAccountStatus() == UserAccountStatus.LOCKED) { + throw new IllegalArgumentException(MessageFormat.format("this.user.userId={0} is not valid", this.getUser().getUserId())); //NOI18N + } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.LOCKED) { // User account is locked - throw new FacesException(new UserStatusLockedException(user)); - } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { + throw new FacesException(new UserStatusLockedException(this.getUser())); + } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { // User account is locked - throw new FaceletException(new UserStatusUnconfirmedException(user)); + throw new FaceletException(new UserStatusUnconfirmedException(this.getUser())); } else if (this.getUserLockReason() == null) { // Throw NPE again throw new NullPointerException("this.userLockReason is null"); //NOI18N @@ -655,14 +662,14 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Init updated user instance - User updatedUser; + final User updatedUser; try { // Get base URL - String baseUrl = FacesUtils.generateBaseUrl(); + final String baseUrl = FacesUtils.generateBaseUrl(); // Call EJB to lock account - updatedUser = this.adminUserBean.lockUserAccount(user, this.getUserLockReason(), baseUrl); + updatedUser = this.adminUserBean.lockUserAccount(this.getUser(), this.getUserLockReason(), baseUrl); } catch (final UserStatusLockedException | UserStatusUnconfirmedException | UserNotFoundException ex) { // Throw again throw new FaceletException(ex); @@ -685,36 +692,33 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J * @return Redirect outcome */ public String unlockUserAccount () { - // Get user instance - User user = this.beanHelper.getUser(); - // Is the user instance valid and CONFIRMED? - if (null == user) { + if (this.getUser() == null) { // Throw NPE - throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { + throw new NullPointerException("this.user is null"); //NOI18N + } else if (this.getUser().getUserId() == null) { // Throw again - throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { + throw new NullPointerException("this.user.userId is null"); //NOI18N + } else if (this.getUser().getUserId() < 1) { // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N - } else if (user.getUserAccountStatus() == UserAccountStatus.CONFIRMED) { + throw new IllegalArgumentException(MessageFormat.format("this.user.userId={0} is not valid", this.getUser().getUserId())); //NOI18N + } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.CONFIRMED) { // User account is locked - throw new FacesException(new UserStatusConfirmedException(user)); - } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { + throw new FacesException(new UserStatusConfirmedException(this.getUser())); + } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { // User account is locked - throw new FaceletException(new UserStatusUnconfirmedException(user)); + throw new FaceletException(new UserStatusUnconfirmedException(this.getUser())); } // Init updated user instance - User updatedUser; + final User updatedUser; try { // Get base URL - String baseUrl = FacesUtils.generateBaseUrl(); + final String baseUrl = FacesUtils.generateBaseUrl(); // Call EJB to unlock account - updatedUser = this.adminUserBean.unlockUserAccount(user, baseUrl); + updatedUser = this.adminUserBean.unlockUserAccount(this.getUser(), baseUrl); } catch (final UserStatusConfirmedException | UserStatusUnconfirmedException | UserNotFoundException ex) { // Throw again throw new FaceletException(ex); @@ -735,11 +739,10 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ private void clear () { // Clear all data - // - other data - this.setUserName(null); - this.setUserPassword(null); - this.setUserPasswordRepeat(null); + this.setContact(null); + this.setUserLockReason(null); this.setUserMustChangePassword(null); + this.setUserName(null); } /**