renamed to better names

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / user / JobsAdminUserWebRequestBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
index 0bcf903ec200499b5d5f79b5afecd57c5621f9a7..99b8fe5f0b327e3e73d001dc681a6e01862e635c 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.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
@@ -37,19 +37,12 @@ import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController;
 import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController;
 import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController;
 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.delete.AdminDeletedUserEvent;
-import org.mxchange.jusercore.events.user.delete.AdminUserDeletedEvent;
 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;
@@ -64,11 +57,18 @@ 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.jusercore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent;
+import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
+import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent;
+import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent;
+import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent;
 
 /**
  * A user controller (bean)
  * <p>
- * @author Roland Haeder<roland@mxchange.org>
+ * @author Roland Häder<roland@mxchange.org>
  */
 @Named ("adminUserController")
 @RequestScoped
@@ -84,7 +84,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
         */
        @Inject
        @Any
-       private Event<AdminAddedUserEvent> addedUserEvent;
+       private Event<ObservableAdminAddedUserEvent> addedUserEvent;
 
        /**
         * Regular contact controller
@@ -114,7 +114,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
         */
        @Inject
        @Any
-       private Event<AdminDeletedUserEvent> deleteUserEvent;
+       private Event<ObservableAdminDeletedUserEvent> deleteUserEvent;
 
        /**
         * Localization controller
@@ -127,7 +127,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
         */
        @Inject
        @Any
-       private Event<AdminUpdatedUserDataEvent> updatedUserDataEvent;
+       private Event<ObservableAdminUpdatedUserDataEvent> updatedUserDataEvent;
 
        /**
         * General user EJB
@@ -151,7 +151,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
         */
        @Inject
        @Any
-       private Event<AdminLinkedUserEvent> userLinkedEvent;
+       private Event<ObservableAdminLinkedUserEvent> userLinkedEvent;
 
        /**
         * User lock reason
@@ -163,7 +163,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
         */
        @Inject
        @Any
-       private Event<AdminLockedUserEvent> userLockedEvent;
+       private Event<ObservableAdminLockedUserEvent> userLockedEvent;
 
        /**
         * Flag whether user must change password after login
@@ -190,7 +190,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
         */
        @Inject
        @Any
-       private Event<AdminUnlockedUserEvent> userUnlockedEvent;
+       private Event<ObservableAdminUnlockedUserEvent> userUnlockedEvent;
 
        /**
         * Default constructor
@@ -203,7 +203,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
+                       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);
@@ -250,6 +250,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
 
                // Set user name, CONFIRMED and INVISIBLE
                user.setUserName(this.getUserName());
+               user.setUserMustChangePassword(this.getUserMustChangePassword());
                user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
                user.setUserProfileMode(ProfileMode.INVISIBLE);
 
@@ -278,7 +279,14 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                        throw new FaceletException(new UserNameAlreadyRegisteredException(user));
                } 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(JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH);
@@ -304,7 +312,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                                User updatedUser = this.adminUserBean.linkUser(user);
 
                                // Fire event
-                               this.userLinkedEvent.fire(new AdminUserLinkedEvent(updatedUser));
+                               this.userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser));
 
                                // Remove contact instance
                                this.beanHelper.setContact(null);
@@ -313,7 +321,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                                User updatedUser = this.adminUserBean.addUser(user);
 
                                // Fire event
-                               this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser));
+                               this.addedUserEvent.fire(new AdminAddedUserEvent(updatedUser));
                        }
                } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
                        // Throw again
@@ -331,7 +339,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        }
 
        @Override
-       public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) {
+       public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -382,7 +390,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Fire event
-               this.deleteUserEvent.fire(new AdminUserDeletedEvent(user, this.getUserDeleteReason()));
+               this.deleteUserEvent.fire(new AdminDeletedUserEvent(user, this.getUserDeleteReason()));
 
                // Redirect
                return "admin_list_user"; //NOI18N
@@ -413,20 +421,30 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                        // 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
@@ -447,7 +465,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                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
@@ -554,7 +572,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Fire event
-               this.userLockedEvent.fire(new AdminUserLockedEvent(updatedUser));
+               this.userLockedEvent.fire(new AdminLockedUserEvent(updatedUser));
 
                // Clear bean
                this.clear();
@@ -598,7 +616,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Fire event
-               this.userUnlockedEvent.fire(new AdminUserUnlockedEvent(updatedUser));
+               this.userUnlockedEvent.fire(new AdminUnlockedUserEvent(updatedUser));
 
                // Clear bean
                this.clear();