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

Signed-off-by: Roland Häder <roland@haeder.net>
Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
index 8143692446a92aff078f647073ed0f138b39f86f..e9ff94d14f584ec27a752c3c7fd0e5d5a04eda81 100644 (file)
--- 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<AdminAddedUserEvent> 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<AdminUpdatedUserDataEvent> 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 764e09dba4b8da0d128ded1d13c24a449158d010..0f02e8db8dcc981266b1a0618aa9b2cf05fea676 100644 (file)
--- 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.
+        * <p>
+        * @param user User instance to be locked
+        * <p>
+        * @return Redirect outcome
+        */
+       String lockUserAccount (final User user);
+
        /**
         * Getter for user name
         * <p>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 06f86a245d5f6ae911c0de136f9405d0e329527b..19ec057cd5a3ce69a1a42190403e31610eabc2d3 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -78,9 +78,9 @@
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.CONFIRMED}" />
+                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.CONFIRMED}" />
 
-                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.LOCKED}" />
+                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.LOCKED}" />
 
                                                <h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.UNCONFIRMED}" />
                                        </div>