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=027f3698e8b6bd6879e70ea2fb8e2f983222cdea;hpb=74fc01205d863debc93e4b86bbc1016e2d00fe0b;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 027f3698..f8158ea5 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -34,13 +34,17 @@ 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.JobsWebRequestController; +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; @@ -91,10 +95,10 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J private final AdminUserSessionBeanRemote adminUserBean; /** - * Admin helper instance + * Bean helper */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewHelperController beanHelper; /** * Regular contact controller @@ -133,6 +137,13 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ 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 */ @@ -153,6 +164,13 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ private String userPasswordRepeat; + /** + * Event being fired when admin unlocks an account + */ + @Inject + @Any + private Event userUnlockedEvent; + /** * Default constructor */ @@ -187,8 +205,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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"); //NOI18N } else if (this.adminContactController.getFamilyName() == null) { @@ -196,22 +214,13 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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"); //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 } } @@ -301,10 +310,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } @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 @@ -346,7 +352,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J throw new NullPointerException("beanHelper.user is null"); //NOI18N } else if (user.getUserId() == null) { // Throw NPE again - throw new NullPointerException("beanHelper.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("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N @@ -473,19 +479,28 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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 - this.adminUserBean.lockUserAccount(user, this.getUserLockReason(), baseUrl); + 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?faces-redirect=true&includeViewParams=true"; //NOI18N + return "admin_show_user"; //NOI18N } @Override @@ -508,19 +523,28 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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 - this.adminUserBean.unlockUserAccount(user, baseUrl); + 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?faces-redirect=true&includeViewParams=true"; //NOI18N + return "admin_show_user"; //NOI18N } /**