X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fuser%2FJobsAdminUserWebRequestBean.java;h=39db1e8dd492ce4250700231b42d071f6ff37549;hb=cb27495f81d21c2db808536609900ffd957c30f9;hp=80d1848d6d6eefa1f357c3c1c50e9081823a5e7d;hpb=a685be5f2b0aa26f03756936564c6cb87dd411e9;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 80d1848d..39db1e8d 100644 --- 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, 2017 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 @@ -17,40 +17,39 @@ package org.mxchange.jjobs.beans.user; import java.text.MessageFormat; +import java.util.Locale; import java.util.Objects; +import javax.ejb.EJB; 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.context.FacesContext; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; -import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; -import org.mxchange.jjobs.beans.helper.JobsWebViewController; -import org.mxchange.jusercore.container.login.UserLoginContainer; -import org.mxchange.jusercore.events.registration.UserRegisteredEvent; +import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; 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.created.ObservableCreatedUserEvent; +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.AdminUserLinkedEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; -import org.mxchange.jusercore.events.user.locked.AdminUserLockedEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; -import org.mxchange.jusercore.events.user.unlocked.AdminUserUnlockedEvent; +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; @@ -58,18 +57,21 @@ 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.juserlogincore.container.login.UserLoginContainer; +import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent; +import org.mxchange.juserlogincore.exceptions.UserPasswordRepeatMismatchException; +import org.mxchange.juserlogincore.login.UserLoginUtils; /** * A user controller (bean) *
- * @author Roland Haeder
+ * @return Redirect outcome
+ */
public String addUser () {
// As the form cannot validate the data (required="true"), check it here
if (this.getUserName() == null) {
@@ -198,72 +220,65 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
} else if (this.getUserName().isEmpty()) {
// Is empty
throw new IllegalArgumentException("userName is null"); //NOI18N
- } else if (this.beanHelper.getContact() == null) {
+ } else if (this.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
- } else if (this.adminContactController.getFirstName().isEmpty()) {
- // ... and again
- 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
- } 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
- }
+ this.adminContactController.validateContactData();
}
// Create new user instance
- User user = new LoginUser();
+ final User newUser = new LoginUser();
// Set user name, CONFIRMED and INVISIBLE
- user.setUserName(this.getUserName());
- user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
- user.setUserProfileMode(ProfileMode.INVISIBLE);
+ newUser.setUserName(this.getUserName());
+ newUser.setUserMustChangePassword(this.getUserMustChangePassword());
+ newUser.setUserAccountStatus(UserAccountStatus.CONFIRMED);
+ newUser.setUserProfileMode(ProfileMode.INVISIBLE);
+
+ // Get locale from view-root
+ final Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
+
+ // Copy user locale
+ newUser.setUserLocale(locale);
// Init instance
- Contact contact;
+ Contact userContact;
// Is a contact instance in helper set?
- if (this.beanHelper.getContact() instanceof Contact) {
+ if (this.getContact() instanceof Contact) {
// Then use it for contact linking
- contact = this.beanHelper.getContact();
+ userContact = this.getContact();
} else {
// Create contact instance
- contact = this.contactController.createContactInstance();
+ userContact = this.contactController.createContactInstance();
}
// Set contact in user
- user.setUserContact(contact);
+ newUser.setUserContact(userContact);
// Init variable for password
String password = null;
// Is the user name or email address used already?
// @TODO Add password length check
- if (this.userController.isUserNameRegistered(user)) {
+ if (this.userController.isUserNameRegistered(newUser)) {
// User name is already used
- throw new FaceletException(new UserNameAlreadyRegisteredException(user));
- } else if ((this.beanHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) {
+ throw new FaceletException(new UserNameAlreadyRegisteredException(newUser));
+ } else if ((this.getContact() == null) && (this.contactController.isEmailAddressRegistered(newUser.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);
+ password = UserLoginUtils.createRandomPassword(JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH);
} else if (!this.isSamePasswordEntered()) {
// Both passwords don't match
- throw new FaceletException(new UserPasswordRepeatMismatchException(user));
+ throw new FaceletException(new UserPasswordRepeatMismatchException(newUser));
} else {
// Both match, so get it from this bean
password = this.getUserPassword();
@@ -271,28 +286,25 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
// The password should not be null and at least 5 characters long
assert (password != null) : "password is null"; //NOI18N
- assert (password.length() >= JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N
+ assert (password.length() >= JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N
// Encrypt password and set it
- user.setUserEncryptedPassword(UserUtils.encryptPassword(password));
+ newUser.setUserEncryptedPassword(UserLoginUtils.encryptPassword(password));
try {
// Now, that all is set, call EJB
- if (this.beanHelper.getContact() instanceof Contact) {
+ if (this.getContact() instanceof Contact) {
// Link contact with this user
- User updatedUser = this.adminUserBean.linkUser(user);
+ final User updatedUser = this.adminUserBean.linkUser(newUser);
// Fire event
- this.userLinkedEvent.fire(new AdminUserLinkedEvent(updatedUser));
-
- // Remove contact instance
- this.beanHelper.setContact(null);
+ this.userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser));
} else {
// Add new contact
- User updatedUser = this.adminUserBean.addUser(user);
+ final User updatedUser = this.adminUserBean.addUser(newUser);
// Fire event
- this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser));
+ this.addedUserEvent.fire(new AdminAddedUserEvent(updatedUser));
}
} catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
// Throw again
@@ -300,7 +312,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
}
// Clear helper
- this.beanHelper.setContact(null);
+ this.setContact(null);
// Clear this bean
this.clear();
@@ -309,11 +321,39 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
return "admin_list_user"; //NOI18N
}
- @Override
- public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
- // Trace message
- //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
+ /**
+ * Event observer for when a bean helper has successfully created a user
+ * instance, means the user exists. If the user does not exist, this event
+ * should not fire but instead a proper exception must be thrown.
+ *
+ * @param event User created event
+ */
+ public void afterCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) {
+ // Is the instance valid?
+ if (null == event) {
+ // Throw NPE
+ throw new NullPointerException("event is null"); //NOI18N
+ } else if (event.getCreatedUser() == null) {
+ // Throw NPE again
+ throw new NullPointerException("event.createdUser is null"); //NOI18N
+ } else if (event.getCreatedUser().getUserId() == null) {
+ // Throw NPE again
+ throw new NullPointerException("event.createdUser.userId is null"); //NOI18N
+ } else if (event.getCreatedUser().getUserId() < 1) {
+ // Throw NPE again
+ throw new NullPointerException(MessageFormat.format("event.createdUser.userId={0} is not valid", event.getCreatedUser().getUserId())); //NOI18N
+ }
+ // Set whole user
+ this.setUser(event.getCreatedUser());
+ }
+
+ /**
+ * 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
@@ -330,35 +370,65 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
}
// Get user instance
- User registeredUser = event.getRegisteredUser();
+ final 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();
+ }
+
+ /**
+ * Deletes given user account
+ *
+ * @return Redirect outcome
+ */
+ public String deleteUserData () {
+ // Is the user instance valid and CONFIRMED?
+ if (this.getUser() == null) {
+ // Throw NPE
+ throw new NullPointerException("user is null"); //NOI18N
+ } else if (this.getUser().getUserId() == null) {
+ // Throw again
+ throw new NullPointerException("user.userId is null"); //NOI18N
+ } else if (this.getUser().getUserId() < 1) {
+ // Invalid id number
+ throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", this.getUser().getUserId())); //NOI18N
+ }
+
+ try {
+ // All fine, delete it
+ this.adminUserBean.deleteUser(this.getUser(), this.getUserDeleteReason());
+ } catch (final UserNotFoundException ex) {
+ // Should not happen, so throw again
+ throw new FaceletException(ex);
+ }
+
+ // Fire event
+ this.deleteUserEvent.fire(new AdminDeletedUserEvent(this.getUser(), this.getUserDeleteReason()));
- // Trace message
- //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterRegistration: EXIT!"); //NOI18N
+ // Redirect
+ return "admin_list_user"; //NOI18N
}
- @Override
+ /**
+ * Edits currently loaded user's data in database.
+ *
+ * @return Redirect outcome
+ */
public String editUserData () {
- // Get user instance
- User user = this.beanHelper.getUser();
-
// Null password means not setting it
String encryptedPassword = null;
// Check if user instance is in helper and valid
- if (null == user) {
+ if (this.getUser() == null) {
// Throw NPE
throw new NullPointerException("beanHelper.user is null"); //NOI18N
- } else if (user.getUserId() == null) {
+ } else if (this.getUser().getUserId() == null) {
// Throw NPE again
throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N
- } else if (user.getUserId() < 1) {
+ } else if (this.getUser().getUserId() < 1) {
// Invalid id
- throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N
+ throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", this.getUser().getUserId())); //NOI18N
} else if (this.getUserName() == null) {
// Not all required fields are set
throw new NullPointerException("this.userName is null"); //NOI18N
@@ -366,114 +436,223 @@ 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(this.getUser().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(this.getUser().getUserMustChangePassword(), this.getUserMustChangePassword())) && (UserLoginUtils.ifPasswordMatches(new UserLoginContainer(this.getUser(), 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());
+ encryptedPassword = UserLoginUtils.encryptPassword(this.getUserPassword());
}
// Set user name and flag
- user.setUserName(this.getUserName());
- user.setUserMustChangePassword(this.getUserMustChangePassword());
+ this.getUser().setUserName(this.getUserName());
+ this.getUser().setUserMustChangePassword(this.getUserMustChangePassword());
// Is a password set?
if (encryptedPassword != null) {
// Set it as well
- user.setUserEncryptedPassword(encryptedPassword);
+ this.getUser().setUserEncryptedPassword(encryptedPassword);
}
// Call EJB for updating user data
- User updatedUser = this.userBean.updateUserData(user);
+ final User updatedUser = this.userBean.updateUserData(this.getUser());
// 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
+ /**
+ * Getter for contact instance
+ *
+ * @return Contact instance
+ */
+ public Contact getContact () {
+ return this.contact;
+ }
+
+ /**
+ * Setter for contact instance
+ *
+ * @param contact Contact instance
+ */
+ public void setContact (final Contact contact) {
+ this.contact = contact;
+ }
+
+ /**
+ * Getter for user instance
+ *
+ * @return User instance
+ */
+ public User getUser () {
+ return this.user;
+ }
+
+ /**
+ * Setter for user instance
+ *
+ * @param user User instance
+ */
+ public void setUser (final User user) {
+ this.user = user;
+ }
+
+ /**
+ * Getter for user delete reason
+ *
+ * @return User delete reason
+ */
+ public String getUserDeleteReason () {
+ return this.userDeleteReason;
+ }
+
+ /**
+ * Setter for user delete reason
+ *
+ * @param userDeleteReason User delete reason
+ */
+ public void setUserDeleteReason (final String userDeleteReason) {
+ this.userDeleteReason = userDeleteReason;
+ }
+
+ /**
+ * Getter for user lock reason
+ *
+ * @return User lock reason
+ */
public String getUserLockReason () {
return this.userLockReason;
}
- @Override
+ /**
+ * Setter for user lock reason
+ *
+ * @param userLockReason User lock reason
+ */
public void setUserLockReason (final String userLockReason) {
this.userLockReason = userLockReason;
}
- @Override
+ /**
+ * Getter for flag if user needs to change password
+ *
+ * @return Flag if user needs to change password
+ */
public Boolean getUserMustChangePassword () {
return this.userMustChangePassword;
}
- @Override
+ /**
+ * Setter for flag if user needs to change password
+ *
+ * @param userMustChangePassword Flag if user needs to change password
+ */
public void setUserMustChangePassword (final Boolean userMustChangePassword) {
this.userMustChangePassword = userMustChangePassword;
}
- @Override
+ /**
+ * Getter for user name
+ *
+ * @return User name
+ */
public String getUserName () {
return this.userName;
}
- @Override
+ /**
+ * Setter for user name
+ *
+ * @param userName User name
+ */
public void setUserName (final String userName) {
this.userName = userName;
}
- @Override
+ /**
+ * Getter for clear-text user password
+ *
+ * @return Clear-text user password
+ */
public String getUserPassword () {
return this.userPassword;
}
- @Override
+ /**
+ * Setter for clear-text user password
+ *
+ * @param userPassword Clear-text user password
+ */
public void setUserPassword (final String userPassword) {
this.userPassword = userPassword;
}
- @Override
+ /**
+ * Getter for clear-text user password repeated
+ *
+ * @return Clear-text user password repeated
+ */
public String getUserPasswordRepeat () {
return this.userPasswordRepeat;
}
- @Override
+ /**
+ * Setter for clear-text user password repeated
+ *
+ * @param userPasswordRepeat Clear-text user password repeated
+ */
public void setUserPasswordRepeat (final String userPasswordRepeat) {
this.userPasswordRepeat = userPasswordRepeat;
}
- @Override
- public String lockUserAccount (final User user) {
+ /**
+ * Locks selected user's account. This method makes sure that a lock reason
+ * is provided that th user later can read on login attempts.
+ *
+ * @return Redirect outcome
+ */
+ public String lockUserAccount () {
// Is the user instance valid and CONFIRMED?
- if (null == user) {
+ if (this.getUser() == null) {
// Throw NPE
- throw new NullPointerException("user is null"); //NOI18N
- } else if (user.getUserId() == null) {
+ throw new NullPointerException("this.user is null"); //NOI18N
+ } else if (this.getUser().getUserId() == null) {
// Throw again
- throw new NullPointerException("user.userId is null"); //NOI18N
- } else if (user.getUserId() < 1) {
+ throw new NullPointerException("this.user.userId is null"); //NOI18N
+ } else if (this.getUser().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) {
+ throw new IllegalArgumentException(MessageFormat.format("this.user.userId={0} is not valid", this.getUser().getUserId())); //NOI18N
+ } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.LOCKED) {
// User account is locked
- throw new FacesException(new UserStatusLockedException(user));
- } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
+ throw new FacesException(new UserStatusLockedException(this.getUser()));
+ } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
// User account is locked
- throw new FaceletException(new UserStatusUnconfirmedException(user));
+ throw new FaceletException(new UserStatusUnconfirmedException(this.getUser()));
} else if (this.getUserLockReason() == null) {
// Throw NPE again
throw new NullPointerException("this.userLockReason is null"); //NOI18N
@@ -483,21 +662,21 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
}
// Init updated user instance
- User updatedUser;
+ final User updatedUser;
try {
// Get base URL
- String baseUrl = FacesUtils.generateBaseUrl();
+ final String baseUrl = FacesUtils.generateBaseUrl();
// Call EJB to lock account
- updatedUser = this.adminUserBean.lockUserAccount(user, this.getUserLockReason(), baseUrl);
+ updatedUser = this.adminUserBean.lockUserAccount(this.getUser(), this.getUserLockReason(), baseUrl);
} catch (final UserStatusLockedException | UserStatusUnconfirmedException | UserNotFoundException ex) {
// Throw again
throw new FaceletException(ex);
}
// Fire event
- this.userLockedEvent.fire(new AdminUserLockedEvent(updatedUser));
+ this.userLockedEvent.fire(new AdminLockedUserEvent(updatedUser));
// Clear bean
this.clear();
@@ -506,42 +685,47 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
return "admin_show_user"; //NOI18N
}
- @Override
- public String unlockUserAccount (final User user) {
+ /**
+ * Unlocks selected user's account. This method makes sure that the account
+ * is locked.
+ *
+ * @return Redirect outcome
+ */
+ public String unlockUserAccount () {
// Is the user instance valid and CONFIRMED?
- if (null == user) {
+ if (this.getUser() == null) {
// Throw NPE
- throw new NullPointerException("user is null"); //NOI18N
- } else if (user.getUserId() == null) {
+ throw new NullPointerException("this.user is null"); //NOI18N
+ } else if (this.getUser().getUserId() == null) {
// Throw again
- throw new NullPointerException("user.userId is null"); //NOI18N
- } else if (user.getUserId() < 1) {
+ throw new NullPointerException("this.user.userId is null"); //NOI18N
+ } else if (this.getUser().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) {
+ throw new IllegalArgumentException(MessageFormat.format("this.user.userId={0} is not valid", this.getUser().getUserId())); //NOI18N
+ } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.CONFIRMED) {
// User account is locked
- throw new FacesException(new UserStatusConfirmedException(user));
- } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
+ throw new FacesException(new UserStatusConfirmedException(this.getUser()));
+ } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
// User account is locked
- throw new FaceletException(new UserStatusUnconfirmedException(user));
+ throw new FaceletException(new UserStatusUnconfirmedException(this.getUser()));
}
// Init updated user instance
- User updatedUser;
+ final User updatedUser;
try {
// Get base URL
- String baseUrl = FacesUtils.generateBaseUrl();
+ final String baseUrl = FacesUtils.generateBaseUrl();
// Call EJB to unlock account
- updatedUser = this.adminUserBean.unlockUserAccount(user, baseUrl);
+ updatedUser = this.adminUserBean.unlockUserAccount(this.getUser(), baseUrl);
} catch (final UserStatusConfirmedException | UserStatusUnconfirmedException | UserNotFoundException ex) {
// Throw again
throw new FaceletException(ex);
}
// Fire event
- this.userUnlockedEvent.fire(new AdminUserUnlockedEvent(updatedUser));
+ this.userUnlockedEvent.fire(new AdminUnlockedUserEvent(updatedUser));
// Clear bean
this.clear();
@@ -555,11 +739,10 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
*/
private void clear () {
// Clear all data
- // - other data
- this.setUserName(null);
- this.setUserPassword(null);
- this.setUserPasswordRepeat(null);
+ this.setContact(null);
+ this.setUserLockReason(null);
this.setUserMustChangePassword(null);
+ this.setUserName(null);
}
/**