X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fpizzaapplication%2Fbeans%2Fuser%2FPizzaAdminUserWebRequestBean.java;h=ecea11a916c650d6528ece0e18ae84afb61859c0;hb=94d204235cf894eff47a73f4cb31ac19eb2f62c6;hp=35f814dca27e73b2127723b35f2102252d4bc22d;hpb=7500ab2d5c8dbfee3e17dd977bc3ecd24210fb35;p=pizzaservice-war.git diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index 35f814dc..ecea11a9 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Roland Haeder + * Copyright (C) 2016 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -18,11 +18,11 @@ package org.mxchange.pizzaapplication.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,34 +30,49 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; +import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jusercore.container.login.UserLoginContainer; -import org.mxchange.jusercore.events.registration.UserRegisteredEvent; +import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; -import org.mxchange.jusercore.events.user.add.AdminUserAddedEvent; +import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; +import org.mxchange.jusercore.events.user.delete.AdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; +import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent; -import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent; +import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent; 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; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; -import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController; -import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController; +import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; +import org.mxchange.pizzaapplication.beans.localization.PizzaLocalizationSessionController; /** * Administrative user bean (controller) *

- * @author Roland Haeder + * @author Roland Häder */ @Named ("adminUserController") @RequestScoped -public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestController { +public class PizzaAdminUserWebRequestBean extends BasePizzaController implements PizzaAdminUserWebRequestController { /** * Serial number @@ -69,18 +84,24 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon */ @Inject @Any - private Event addedUserEvent; + private Event addedUserEvent; /** - * Admin helper instance + * Regular contact controller */ @Inject - private PizzaAdminWebRequestController adminHelper; + private PizzaAdminContactWebRequestController adminContactController; /** - * Remote user bean + * Administrative user EJB */ - private final ContactSessionBeanRemote contactBean; + private final AdminUserSessionBeanRemote adminUserBean; + + /** + * Bean helper + */ + @Inject + private PizzaWebRequestHelperController beanHelper; /** * Regular contact controller @@ -88,15 +109,28 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon @Inject private PizzaContactWebSessionController contactController; + /** + * Event being fired when admin has deleted user + */ + @Inject + @Any + private Event deleteUserEvent; + + /** + * Localization controller + */ + @Inject + private PizzaLocalizationSessionController localizationController; + /** * An event fired when the administrator has updated a new user */ @Inject @Any - private Event updatedUserDataEvent; + private Event updatedUserDataEvent; /** - * Remote user bean + * General user EJB */ private final UserSessionBeanRemote userBean; @@ -107,10 +141,34 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon private PizzaUserWebSessionController userController; /** - * Login bean (controller) + * Delete reason + */ + private String userDeleteReason; + + /** + * An event fired when the administrator has linked a user with existing + * contact data. + */ + @Inject + @Any + private Event userLinkedEvent; + + /** + * User lock reason + */ + private String userLockReason; + + /** + * Event being fired when an administrator has locked a user */ @Inject - private PizzaUserLoginWebSessionController userLoginController; + @Any + private Event userLockedEvent; + + /** + * Flag whether user must change password after login + */ + private Boolean userMustChangePassword; /** * User name @@ -118,15 +176,22 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon private String userName; /** - * User password (unencrypted from web form) + * User password (clear-text from web form) */ private String userPassword; /** - * User password repeated (unencrypted from web form) + * User password repeated (clear-text from web form) */ private String userPasswordRepeat; + /** + * Event being fired when admin unlocks an account + */ + @Inject + @Any + private Event userUnlockedEvent; + /** * Default constructor */ @@ -137,10 +202,8 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - - // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + 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); @@ -149,9 +212,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon @Override public String addUser () { - // Create new user instance - User user = new LoginUser(); - // As the form cannot validate the data (required="true"), check it here if (this.getUserName() == null) { // Throw NPE @@ -159,43 +219,38 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon } 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) { - // ... and again - throw new NullPointerException("contactController.emailAddress is null"); - } else if (this.contactController.getEmailAddress().isEmpty()) { - // ... and again - throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N //NOI18N - } else if (this.contactController.getEmailAddressRepeat() == null) { + throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N + } else if (this.adminContactController.getEmailAddress() == null) { // ... and again - throw new NullPointerException("contactController.emailAddressRepeat is null"); - } else if (this.contactController.getEmailAddressRepeat().isEmpty()) { + throw new NullPointerException("contactController.emailAddress is null"); //NOI18N + } else if (this.adminContactController.getEmailAddress().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 } } + // Create new user instance + User user = new LoginUser(); + // Set user name, CONFIRMED and INVISIBLE user.setUserName(this.getUserName()); + user.setUserMustChangePassword(this.getUserMustChangePassword()); user.setUserAccountStatus(UserAccountStatus.CONFIRMED); user.setUserProfileMode(ProfileMode.INVISIBLE); @@ -203,9 +258,9 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon Contact contact; // Is a contact instance in helper set? - if (this.adminHelper.getContact() instanceof Contact) { + if (this.beanHelper.getContact() instanceof Contact) { // Then use it for contact linking - contact = this.adminHelper.getContact(); + contact = this.beanHelper.getContact(); } else { // Create contact instance contact = this.contactController.createContactInstance(); @@ -222,9 +277,16 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon 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)); + this.showFacesMessage("admin_add_user:emailAddress", "ERROR_EMAIL_ADDRESS_ALREADY_USED"); //NOI18N + + // Always clear password + this.setUserPassword(null); + this.setUserPasswordRepeat(null); + + // Skip it + return ""; //NOI18N } else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) { // Empty password entered, then generate one password = UserUtils.createRandomPassword(PizzaUserWebSessionController.MINIMUM_PASSWORD_LENGTH); @@ -243,20 +305,23 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // 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 AdminLinkedUserEvent(updatedUser)); // Remove contact instance - this.adminHelper.setContact(null); + 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 AdminAddedUserEvent(updatedUser)); } } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) { // Throw again @@ -264,10 +329,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon } // Clear helper - this.adminHelper.setContact(null); - - // Fire event - this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); + this.beanHelper.setContact(null); // Clear this bean this.clear(); @@ -276,11 +338,12 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon return "admin_list_user"; //NOI18N } - @Override - public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) { - // Trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N - + /** + * Event observer for new user registrations + *

+ * @param event User registration event + */ + public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -299,20 +362,44 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // Get user instance User registeredUser = event.getRegisteredUser(); - // Debug message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N - + // @TODO Nothing to do with the user here? // Clear all data this.clear(); + } + + @Override + public String deleteUserData (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 + } - // Trace message - //* NOISY-DEBUG: */ System.out.println("AdminUserWebBean:afterRegistration: EXIT!"); //NOI18N + try { + // All fine, delete it + this.adminUserBean.deleteUser(user, 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())); + + // Redirect + return "admin_list_user"; //NOI18N } @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; @@ -320,13 +407,13 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // 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 //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 @@ -334,28 +421,39 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // Not all required fields are set throw new IllegalArgumentException("this.userName is empty"); //NOI18N } else if (((!this.getUserPassword().isEmpty()) || (!this.getUserPasswordRepeat().isEmpty())) && (!this.isSamePasswordEntered())) { - // Not same password entered + // Clear password fields this.setUserPassword(null); this.setUserPasswordRepeat(null); - // Throw exception - throw new FaceletException("Not same password entered"); //NOI18N - } else if (this.userBean.ifUserNameExists(this.getUserName())) { + // 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()))) { + // Clear all fields + this.clear(); + // User name already exists - throw new FaceletException(new UserNameAlreadyRegisteredException(this.getUserName())); + this.showFacesMessage("form_edit_user:userName", "ADMIN_USER_NAME_ALREADY_EXISTS"); //NOI18N + return ""; //NOI18N } else if (this.isSamePasswordEntered()) { // Same password entered, create container - if (UserUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword()))) { + if ((Objects.equals(user.getUserMustChangePassword(), this.getUserMustChangePassword())) && (UserUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword())))) { + // Clear password fields + this.setUserPassword(null); + this.setUserPasswordRepeat(null); + // Same password entered - throw new FaceletException("Same password as stored entered."); //NOI18N + this.showFacesMessage("form_edit_user:userPassword", "ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD"); //NOI18N + return ""; //NOI18N } // Encrypt password 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) { @@ -367,12 +465,42 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon User updatedUser = this.userBean.updateUserData(user); // Fire event - this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser)); + this.updatedUserDataEvent.fire(new AdminUpdatedUserDataEvent(updatedUser)); // Return to user list (for now) return "admin_list_user"; //NOI18N } + @Override + public String getUserDeleteReason () { + return this.userDeleteReason; + } + + @Override + public void setUserDeleteReason (final String userDeleteReason) { + this.userDeleteReason = userDeleteReason; + } + + @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; @@ -403,11 +531,98 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon 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 AdminLockedUserEvent(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 AdminUnlockedUserEvent(updatedUser)); + + // Clear bean + this.clear(); + + // Should go fine at this point, redirect to user profile + return "admin_show_user"; //NOI18N } /** @@ -419,6 +634,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon this.setUserName(null); this.setUserPassword(null); this.setUserPasswordRepeat(null); + this.setUserMustChangePassword(null); } /**