From 7a7031c5f2ca0dface1d39c6d70c6d283b5806a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 5 Aug 2016 15:02:55 +0200 Subject: [PATCH] Continued with locking user accounts: (please cherry-pick) - added user to (by JSF) called methods as he this user needs to be locked - implemented lockUserAccount() including calling EJB (which still needs implementing) - this method redirects back to the user's admin-profile page MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- .../user/JobsAdminUserWebRequestBean.java | 86 +++++++++++++++---- .../JobsAdminUserWebRequestController.java | 11 +++ web/admin/user/admin_user_unlock.xhtml | 4 +- 3 files changed, 84 insertions(+), 17 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 81436924..e9ff94d1 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -22,6 +22,7 @@ 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,8 +31,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; 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.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; @@ -40,7 +41,11 @@ 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.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; @@ -48,6 +53,7 @@ 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.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent; /** * A user bean (controller) @@ -71,7 +77,18 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J private Event addedUserEvent; /** - * Bean helper instance + * Regular contact controller + */ + @Inject + private JobsAdminContactWebRequestController adminContactController; + + /** + * Administrative user EJB + */ + private final AdminUserSessionBeanRemote adminUserBean; + + /** + * Admin helper instance */ @Inject private JobsWebRequestController beanHelper; @@ -90,7 +107,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J private Event updatedUserDataEvent; /** - * Remote user bean + * General user EJB */ private final UserSessionBeanRemote userBean; @@ -136,6 +153,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J // 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); @@ -161,8 +179,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J throw new NullPointerException("contactController.firstName is null"); //NOI18N //NOI18N } else if (this.contactController.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()) { @@ -170,8 +188,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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()) { + 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) { @@ -238,20 +256,23 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J // 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.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 @@ -261,9 +282,6 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J // Clear helper this.beanHelper.setContact(null); - // Fire event - this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); - // Return to user list (for now) return "admin_list_user"; //NOI18N } @@ -416,6 +434,44 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J this.userPasswordRepeat = userPasswordRepeat; } + @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 + } + + try { + // Call EJB to lock account + this.adminUserBean.lockUserAccount(user, this.getUserLockReason()); + } catch (final UserStatusLockedException | UserStatusUnconfirmedException | UserNotFoundException ex) { + // Throw again + throw new FaceletException(ex); + } + + // Should go fine at this point, redirect to user profile + return "admin_show_user?faces-redirect=true&includeViewParams=true"; //NOI18N + } + /** * Clears this bean */ diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java index 764e09db..0f02e8db 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java @@ -18,6 +18,7 @@ package org.mxchange.jjobs.beans.user; import java.io.Serializable; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; +import org.mxchange.jusercore.model.user.User; /** * An interface for user beans @@ -49,6 +50,16 @@ public interface JobsAdminUserWebRequestController extends Serializable { */ String editUserData (); + /** + * Locks selected user's account. This method makes sure that a lock reason + * is provided that th user later can read on login attempts. + *

+ * @param user User instance to be locked + *

+ * @return Redirect outcome + */ + String lockUserAccount (final User user); + /** * Getter for user name *

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index 06f86a24..19ec057c 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -78,9 +78,9 @@

- + - +
-- 2.39.5