+ * @return Redirect outcome + */ public String doChangePassword () { // This method shall only be called if the user is logged-in if (!this.userLoginController.isUserLoggedIn()) { @@ -111,16 +116,16 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement throw new IllegalStateException("User is not logged-in"); //NOI18N } else if (!this.isRequiredChangePasswordSet()) { // Not all required fields are set - throw new FaceletException("Not all required fields are set."); //NOI18N + throw new FacesException("Not all required fields are set."); //NOI18N } else if (!this.userLoginController.ifCurrentPasswordMatches()) { // Password not matching - throw new FaceletException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); + throw new FacesException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); } else if (!this.featureController.isFeatureEnabled("change_user_password")) { //NOI18N // Editing is not allowed throw new IllegalStateException("User tried to change password."); //NOI18N } else if (!UserLoginUtils.ifPasswordMatches(this.getUserCurrentPassword(), this.userLoginController.getLoggedInUser())) { // Password mismatches - this.showFacesMessage("form_user_change_password:userCurrentPassword", "Entered current password does not matched stored password."); //NOI18N + this.showFacesMessage("form_user_change_password:userCurrentPassword", "Entered current password does not matched stored password.", FacesMessage.SEVERITY_WARN); //NOI18N // Clear bean this.clear(); @@ -129,7 +134,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement return ""; //NOI18N } else if (!Objects.equals(this.getUserPassword(), this.getUserPasswordRepeat())) { // Both entered passwords don't match - this.showFacesMessage("form_user_change_password:userPasswordRepeat", "Entered new passwords mismatch."); //NOI18N + this.showFacesMessage("form_user_change_password:userPasswordRepeat", "Entered new passwords mismatch.", FacesMessage.SEVERITY_ERROR); //NOI18N // Clear bean this.clear(); @@ -138,7 +143,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement return ""; //NOI18N } else if (Objects.equals(this.getUserCurrentPassword(), this.getUserPassword())) { // New password matches current - this.showFacesMessage("form_user_change_password:userPassword", "Entered new password is same as current password."); //NOI18N + this.showFacesMessage("form_user_change_password:userPassword", "Entered new password is same as current password.", FacesMessage.SEVERITY_WARN); //NOI18N // Clear bean this.clear(); @@ -147,7 +152,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement return ""; //NOI18N } else if (this.userLoginController.isPasswordInHistory(this.getUserPassword())) { // Is already in list (to old passwords are ignored) - this.showFacesMessage("form_user_change_password:userPassword", "Entered new password is has already been used some time ago."); //NOI18N + this.showFacesMessage("form_user_change_password:userPassword", "Entered new password is has already been used some time ago.", FacesMessage.SEVERITY_WARN); //NOI18N // Clear bean this.clear(); @@ -157,31 +162,34 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement } // Get user instance - User user = this.userLoginController.getLoggedInUser(); + final User user = this.userLoginController.getLoggedInUser(); // Encrypt password - String encryptedPassword = UserLoginUtils.encryptPassword(this.getUserPassword()); + final String encryptedPassword = UserLoginUtils.encryptPassword(this.getUserPassword()); // Set it in user user.setUserEncryptedPassword(encryptedPassword); + // Init variable + final PasswordHistory passwordHistory; + try { // Get base URL - String baseUrl = FacesUtils.generateBaseUrl(); + final String baseUrl = FacesUtils.generateBaseUrl(); // All is set, then update password - PasswordHistory passwordHistory = this.userBean.updateUserPassword(user, baseUrl); - - // Fire event - this.userUpdatedPasswordEvent.fire(new UpdatedUserPasswordEvent(passwordHistory)); + passwordHistory = this.userBean.updateUserPassword(user, baseUrl); } catch (final UserNotFoundException | UserStatusUnconfirmedException | UserStatusLockedException ex) { // Clear bean this.clear(); // Throw again - throw new FaceletException(ex); + throw new FacesException(ex); } + // Fire event + this.userUpdatedPasswordEvent.fire(new UpdatedUserPasswordEvent(passwordHistory, this.getUserPassword())); + // Clear bean this.clear(); @@ -189,52 +197,58 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement return "login_data_saved"; //NOI18N } - @Override + /** + * Getter for current clear-text user password + *
+ * @return Current clear-text user password + */ public String getUserCurrentPassword () { return this.userCurrentPassword; } - @Override + /** + * Setter for current clear-text user password + *
+ * @param userCurrentPassword Current clear-text user password + */ public void setUserCurrentPassword (final String userCurrentPassword) { this.userCurrentPassword = userCurrentPassword; } - @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 - public void setUserPasswordRepeat (final String userPasswordRepeat) { - this.userPasswordRepeat = userPasswordRepeat; - } - /** - * Post-initialization of this class + * Setter for clear-text user password repeated + *
+ * @param userPasswordRepeat Clear-text user password repeated */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } + public void setUserPasswordRepeat (final String userPasswordRepeat) { + this.userPasswordRepeat = userPasswordRepeat; } @Override