/*
- * 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
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.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.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;
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.JobsWebViewHelperController;
+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
*/
@Inject
@Any
- private Event<AdminAddedUserEvent> addedUserEvent;
+ private Event<ObservableAdminAddedUserEvent> addedUserEvent;
/**
* Regular contact controller
private final AdminUserSessionBeanRemote adminUserBean;
/**
- * Admin helper instance
+ * Bean helper
*/
@Inject
private JobsWebViewHelperController beanHelper;
@Inject
private JobsContactWebSessionController contactController;
+ /**
+ * Event being fired when admin has deleted user
+ */
+ @Inject
+ @Any
+ private Event<ObservableAdminDeletedUserEvent> deleteUserEvent;
+
+ /**
+ * Localization controller
+ */
+ @Inject
+ private JobsLocalizationSessionController localizationController;
+
/**
* An event fired when the administrator has updated a new user
*/
@Inject
@Any
- private Event<AdminUpdatedUserDataEvent> updatedUserDataEvent;
+ private Event<ObservableAdminUpdatedUserDataEvent> updatedUserDataEvent;
/**
* General user EJB
@Inject
private JobsUserWebSessionController userController;
+ /**
+ * Delete reason
+ */
+ private String userDeleteReason;
+
/**
* An event fired when the administrator has linked a user with existing
* contact data.
*/
@Inject
@Any
- private Event<AdminLinkedUserEvent> userLinkedEvent;
+ private Event<ObservableAdminLinkedUserEvent> userLinkedEvent;
/**
* User lock reason
*/
@Inject
@Any
- private Event<AdminLockedUserEvent> userLockedEvent;
+ private Event<ObservableAdminLockedUserEvent> userLockedEvent;
/**
* Flag whether user must change password after login
*/
@Inject
@Any
- private Event<AdminUnlockedUserEvent> userUnlockedEvent;
+ private Event<ObservableAdminUnlockedUserEvent> userUnlockedEvent;
/**
* Default constructor
// 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);
// Set user name, CONFIRMED and INVISIBLE
user.setUserName(this.getUserName());
+ user.setUserMustChangePassword(this.getUserMustChangePassword());
user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
user.setUserProfileMode(ProfileMode.INVISIBLE);
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);
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);
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
}
@Override
- public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
- // Trace message
- //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
-
+ public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
// event should not be null
if (null == event) {
// Throw NPE
//* NOISY-DEBUG: */ System.out.println("UserWebBean:afterRegistration: EXIT!"); //NOI18N
}
+ @Override
+ public String deleteUserData (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
+ }
+
+ try {
+ // All fine, delete it
+ this.adminUserBean.deleteUser(user, this.getUserDeleteReason());
+ } catch (final UserNotFoundException ex) {
+ // Should not happen, so throw again
+ throw new FaceletException(ex);
+ }
+
+ // Fire event
+ this.deleteUserEvent.fire(new AdminDeletedUserEvent(user, this.getUserDeleteReason()));
+
+ // Redirect
+ return "admin_list_user"; //NOI18N
+ }
+
@Override
public String editUserData () {
// Get user instance
// 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
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
}
+ @Override
+ public String getUserDeleteReason () {
+ return this.userDeleteReason;
+ }
+
+ @Override
+ public void setUserDeleteReason (final String userDeleteReason) {
+ this.userDeleteReason = userDeleteReason;
+ }
+
@Override
public String getUserLockReason () {
return this.userLockReason;
}
// Fire event
- this.userLockedEvent.fire(new AdminUserLockedEvent(updatedUser));
+ this.userLockedEvent.fire(new AdminLockedUserEvent(updatedUser));
// Clear bean
this.clear();
}
// Fire event
- this.userUnlockedEvent.fire(new AdminUserUnlockedEvent(updatedUser));
+ this.userUnlockedEvent.fire(new AdminUnlockedUserEvent(updatedUser));
// Clear bean
this.clear();
projects / jjobs-war.git / blobdiff