X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fuser%2FJobsAdminUserWebRequestBean.java;h=f8158ea5452fa9381bb880fa1c89dd9989064212;hb=9e639fa60eb238cff3940ae6d982650959875345;hp=fbbb33743dd95c70cc19b7659f423102483e2e03;hpb=284ea8f49a7fda3d8568181e490e1bfa2b79be24;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 fbbb3374..f8158ea5 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -18,11 +18,11 @@ package org.mxchange.jjobs.beans.user; import java.text.MessageFormat; import java.util.Objects; -import javax.annotation.PostConstruct; 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.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; @@ -30,18 +30,31 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcoreee.utils.FacesUtils; +import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; -import org.mxchange.jjobs.beans.helper.JobsAdminWebRequestController; -import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; +import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.add.AdminUserAddedEvent; +import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent; +import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; +import org.mxchange.jusercore.events.user.locked.AdminUserLockedEvent; +import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.unlocked.AdminUserUnlockedEvent; import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent; import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; +import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserPasswordRepeatMismatchException; +import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; +import org.mxchange.jusercore.exceptions.UserStatusLockedException; +import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; +import org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; @@ -50,13 +63,13 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; /** - * A user bean (controller) + * A user controller (bean) *

* @author Roland Haeder */ @Named ("adminUserController") @RequestScoped -public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestController { +public class JobsAdminUserWebRequestBean extends BaseJobsController implements JobsAdminUserWebRequestController { /** * Serial number @@ -71,10 +84,21 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr private Event addedUserEvent; /** - * Admin helper instance + * Regular contact controller */ @Inject - private JobsAdminWebRequestController adminHelper; + private JobsAdminContactWebRequestController adminContactController; + + /** + * Administrative user EJB + */ + private final AdminUserSessionBeanRemote adminUserBean; + + /** + * Bean helper + */ + @Inject + private JobsWebViewHelperController beanHelper; /** * Regular contact controller @@ -90,7 +114,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr private Event updatedUserDataEvent; /** - * Remote user bean + * General user EJB */ private final UserSessionBeanRemote userBean; @@ -101,10 +125,29 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr private JobsUserWebSessionController userController; /** - * Login bean (controller) + * An event fired when the administrator has linked a user with existing + * contact data. */ @Inject - private JobsUserLoginWebSessionController userLoginController; + @Any + private Event userLinkedEvent; + + /** + * User lock reason + */ + private String userLockReason; + + /** + * Event being fired when an administrator has locked a user + */ + @Inject + @Any + private Event userLockedEvent; + + /** + * Flag whether user must change password after login + */ + private Boolean userMustChangePassword; /** * User name @@ -121,6 +164,13 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr */ private String userPasswordRepeat; + /** + * Event being fired when admin unlocks an account + */ + @Inject + @Any + private Event userUnlockedEvent; + /** * Default constructor */ @@ -132,6 +182,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // 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/user!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -147,38 +198,29 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr } else if (this.getUserName().isEmpty()) { // Is empty throw new IllegalArgumentException("userName is null"); //NOI18N - } else if (this.adminHelper.getContact() == null) { + } else if (this.beanHelper.getContact() == null) { // No contact instance set, so test required fields: gender, first name and family name if (this.contactController.getGender() == null) { // Throw NPE again throw new NullPointerException("contactController.gender is null"); //NOI18N } else if (this.contactController.getFirstName() == null) { // ... and again - throw new NullPointerException("contactController.firstName is null"); //NOI18N //NOI18N - } else if (this.contactController.getFirstName().isEmpty()) { + throw new NullPointerException("contactController.firstName is null"); //NOI18N + } else if (this.adminContactController.getFirstName().isEmpty()) { // ... and again - throw new IllegalArgumentException("contactController.firstName is empty"); - } else if (this.contactController.getFamilyName() == null) { + throw new IllegalArgumentException("contactController.firstName is empty"); //NOI18N + } else if (this.adminContactController.getFamilyName() == null) { // ... and again throw new NullPointerException("contactController.familyName is null"); //NOI18N } else if (this.contactController.getFamilyName().isEmpty()) { // ... and again - throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N //NOI18N - } else if (this.contactController.getEmailAddress() == null) { + throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N + } else if (this.adminContactController.getEmailAddress() == null) { // ... and again - throw new NullPointerException("contactController.emailAddress is null"); - } else if (this.contactController.getEmailAddress().isEmpty()) { + throw new NullPointerException("contactController.emailAddress is null"); //NOI18N + } else if (this.adminContactController.getEmailAddress().isEmpty()) { // ... and again - throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N //NOI18N - } else if (this.contactController.getEmailAddressRepeat() == null) { - // ... and again - throw new NullPointerException("contactController.emailAddressRepeat is null"); - } else if (this.contactController.getEmailAddressRepeat().isEmpty()) { - // ... and again - throw new IllegalArgumentException("contactController.emailAddressRepeat is empty"); //NOI18N //NOI18N - } else if (!Objects.equals(this.contactController.getEmailAddress(), this.contactController.getEmailAddressRepeat())) { - // Is not same email address - throw new IllegalArgumentException("Both entered email addresses don't match."); + throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N } } @@ -190,8 +232,17 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr user.setUserAccountStatus(UserAccountStatus.CONFIRMED); user.setUserProfileMode(ProfileMode.INVISIBLE); - // Create contact instance - Contact contact = this.contactController.createContactInstance(); + // Init instance + Contact contact; + + // Is a contact instance in helper set? + if (this.beanHelper.getContact() instanceof Contact) { + // Then use it for contact linking + contact = this.beanHelper.getContact(); + } else { + // Create contact instance + contact = this.contactController.createContactInstance(); + } // Set contact in user user.setUserContact(contact); @@ -204,7 +255,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr if (this.userController.isUserNameRegistered(user)) { // User name is already used throw new FaceletException(new UserNameAlreadyRegisteredException(user)); - } else if ((this.adminHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) { + } else if ((this.beanHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) { // Email address is already used throw new FaceletException(new EmailAddressAlreadyRegisteredException(user)); } else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) { @@ -225,35 +276,41 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Encrypt password and set it user.setUserEncryptedPassword(UserUtils.encryptPassword(password)); - // Init updated user instance - User updatedUser = null; - try { // Now, that all is set, call EJB - if (this.adminHelper.getContact() instanceof Contact) { + if (this.beanHelper.getContact() instanceof Contact) { // Link contact with this user - updatedUser = this.userBean.linkUser(user); + User updatedUser = this.adminUserBean.linkUser(user); + + // Fire event + this.userLinkedEvent.fire(new AdminUserLinkedEvent(updatedUser)); + + // Remove contact instance + this.beanHelper.setContact(null); } else { // Add new contact - updatedUser = this.userBean.addUser(user); + User updatedUser = this.adminUserBean.addUser(user); + + // Fire event + this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); } } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) { // Throw again throw new FaceletException(ex); } - // Fire event - this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); + // Clear helper + this.beanHelper.setContact(null); + + // Clear this bean + this.clear(); // Return to user list (for now) return "admin_list_user"; //NOI18N } @Override - public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) { - // Trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N - + public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -274,7 +331,6 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Debug message //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N - // Clear all data this.clear(); @@ -285,7 +341,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr @Override public String editUserData () { // Get user instance - User user = this.adminHelper.getUser(); + User user = this.beanHelper.getUser(); // Null password means not setting it String encryptedPassword = null; @@ -293,13 +349,13 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Check if user instance is in helper and valid if (null == user) { // Throw NPE - throw new NullPointerException("adminHelper.user is null"); //NOI18N + throw new NullPointerException("beanHelper.user is null"); //NOI18N } else if (user.getUserId() == null) { // Throw NPE again - throw new NullPointerException("adminHelper.user.userId is null"); //NOI18N //NOI18N + throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N } else if (user.getUserId() < 1) { // Invalid id - throw new IllegalStateException(MessageFormat.format("adminHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N + throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N } else if (this.getUserName() == null) { // Not all required fields are set throw new NullPointerException("this.userName is null"); //NOI18N @@ -327,8 +383,9 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr encryptedPassword = UserUtils.encryptPassword(this.getUserPassword()); } - // Set user name + // Set user name and flag user.setUserName(this.getUserName()); + user.setUserMustChangePassword(this.getUserMustChangePassword()); // Is a password set? if (encryptedPassword != null) { @@ -346,6 +403,26 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr return "admin_list_user"; //NOI18N } + @Override + public String getUserLockReason () { + return this.userLockReason; + } + + @Override + public void setUserLockReason (final String userLockReason) { + this.userLockReason = userLockReason; + } + + @Override + public Boolean getUserMustChangePassword () { + return this.userMustChangePassword; + } + + @Override + public void setUserMustChangePassword (final Boolean userMustChangePassword) { + this.userMustChangePassword = userMustChangePassword; + } + @Override public String getUserName () { return this.userName; @@ -376,11 +453,98 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr this.userPasswordRepeat = userPasswordRepeat; } - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { + @Override + public String lockUserAccount (final User user) { + // Is the user instance valid and CONFIRMED? + if (null == user) { + // Throw NPE + throw new NullPointerException("user is null"); //NOI18N + } else if (user.getUserId() == null) { + // Throw again + throw new NullPointerException("user.userId is null"); //NOI18N + } else if (user.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) { + // User account is locked + throw new FacesException(new UserStatusLockedException(user)); + } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { + // User account is locked + throw new FaceletException(new UserStatusUnconfirmedException(user)); + } else if (this.getUserLockReason() == null) { + // Throw NPE again + throw new NullPointerException("this.userLockReason is null"); //NOI18N + } else if (this.getUserLockReason().isEmpty()) { + // Empty lock reason + throw new IllegalArgumentException("this.userLockReason is empty"); //NOI18N + } + + // Init updated user instance + User updatedUser; + + try { + // Get base URL + String baseUrl = FacesUtils.generateBaseUrl(); + + // Call EJB to lock account + updatedUser = this.adminUserBean.lockUserAccount(user, this.getUserLockReason(), baseUrl); + } catch (final UserStatusLockedException | UserStatusUnconfirmedException | UserNotFoundException ex) { + // Throw again + throw new FaceletException(ex); + } + + // Fire event + this.userLockedEvent.fire(new AdminUserLockedEvent(updatedUser)); + + // Clear bean + this.clear(); + + // Should go fine at this point, redirect to user profile + return "admin_show_user"; //NOI18N + } + + @Override + public String unlockUserAccount (final User user) { + // Is the user instance valid and CONFIRMED? + if (null == user) { + // Throw NPE + throw new NullPointerException("user is null"); //NOI18N + } else if (user.getUserId() == null) { + // Throw again + throw new NullPointerException("user.userId is null"); //NOI18N + } else if (user.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) { + // User account is locked + throw new FacesException(new UserStatusConfirmedException(user)); + } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { + // User account is locked + throw new FaceletException(new UserStatusUnconfirmedException(user)); + } + + // Init updated user instance + User updatedUser; + + try { + // Get base URL + String baseUrl = FacesUtils.generateBaseUrl(); + + // Call EJB to unlock account + updatedUser = this.adminUserBean.unlockUserAccount(user, baseUrl); + } catch (final UserStatusConfirmedException | UserStatusUnconfirmedException | UserNotFoundException ex) { + // Throw again + throw new FaceletException(ex); + } + + // Fire event + this.userUnlockedEvent.fire(new AdminUserUnlockedEvent(updatedUser)); + + // Clear bean + this.clear(); + + // Should go fine at this point, redirect to user profile + return "admin_show_user"; //NOI18N } /** @@ -392,6 +556,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr this.setUserName(null); this.setUserPassword(null); this.setUserPasswordRepeat(null); + this.setUserMustChangePassword(null); } /**