X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjava%2Forg%2Fmxchange%2Fpizzaapplication%2Fbeans%2Fuser%2FPizzaAdminUserWebRequestBean.java;h=f27c950b3a85424f7d3a4fc3a9f5b13e1ca4cc20;hb=fea403ed5c05f960a2d17fd4c8f4ca639c46cbb2;hp=0bed8e1f028f1cd03e9257a6e3a8961509ac648e;hpb=815dc7a6f40250f92de6ad7a9beae1b4655a9d0f;p=pizzaservice-war.git
diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
index 0bed8e1f..f27c950b 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.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
@@ -17,14 +17,12 @@
package org.mxchange.pizzaapplication.beans.user;
import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
import java.util.Objects;
-import javax.annotation.PostConstruct;
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;
@@ -32,28 +30,42 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController;
-import org.mxchange.jusercore.events.user.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.AdminUserAddedEvent;
+import org.mxchange.jcoreee.utils.FacesUtils;
+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.linked.AdminLinkedUserEvent;
+import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent;
+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.UserStatusConfirmedException;
+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;
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.pizzaapplication.beans.BasePizzaController;
+import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController;
+import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController;
+import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestController;
/**
- * A user bean (controller)
+ * Administrative user bean (controller)
*
- * @author Roland Haeder
+ * @author Roland Häder
*/
@Named ("adminUserController")
@RequestScoped
-public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestController {
+public class PizzaAdminUserWebRequestBean extends BasePizzaController implements PizzaAdminUserWebRequestController {
/**
* Serial number
@@ -67,6 +79,23 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
@Any
private Event addedUserEvent;
+ /**
+ * Regular contact controller
+ */
+ @Inject
+ private PizzaAdminContactWebRequestController adminContactController;
+
+ /**
+ * Administrative user EJB
+ */
+ private final AdminUserSessionBeanRemote adminUserBean;
+
+ /**
+ * Admin helper instance
+ */
+ @Inject
+ private PizzaWebRequestController beanHelper;
+
/**
* Regular contact controller
*/
@@ -74,7 +103,14 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
private PizzaContactWebSessionController contactController;
/**
- * Remote user bean
+ * An event fired when the administrator has updated a new user
+ */
+ @Inject
+ @Any
+ private Event updatedUserDataEvent;
+
+ /**
+ * General user EJB
*/
private final UserSessionBeanRemote userBean;
@@ -85,9 +121,22 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
private PizzaUserWebSessionController userController;
/**
- * A list of all user profiles
+ * An event fired when the administrator has linked a user with existing
+ * contact data.
+ */
+ @Inject
+ @Any
+ private Event userLinkedEvent;
+
+ /**
+ * User lock reason
*/
- private List userList;
+ private String userLockReason;
+
+ /**
+ * Flag whether user must change password after login
+ */
+ private Boolean userMustChangePassword;
/**
* User name
@@ -114,7 +163,8 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
Context context = new InitialContext();
// Try to lookup
- this.userBean = (UserSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
+ this.userBean = (UserSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
+ this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N
} catch (final NamingException e) {
// Throw again
throw new FaceletException(e);
@@ -122,38 +172,89 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
}
@Override
- public void addUser () {
+ public String addUser () {
// Create new user instance
- User localUser = new LoginUser();
+ User user = new LoginUser();
+
+ // As the form cannot validate the data (required="true"), check it here
+ if (this.getUserName() == null) {
+ // Throw NPE
+ throw new NullPointerException("userName is null"); //NOI18N
+ } else if (this.getUserName().isEmpty()) {
+ // Is empty
+ throw new IllegalArgumentException("userName is null"); //NOI18N
+ } else if (this.beanHelper.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 //NOI18N
+ } else if (this.contactController.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 //NOI18N
+ } else if (this.contactController.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 //NOI18N
+ } else if (this.contactController.getEmailAddressRepeat() == null) {
+ // ... and again
+ throw new NullPointerException("contactController.emailAddressRepeat is null");
+ } else if (this.contactController.getEmailAddressRepeat().isEmpty()) {
+ // ... and again
+ throw new IllegalArgumentException("contactController.emailAddressRepeat is empty"); //NOI18N //NOI18N
+ } else if (!Objects.equals(this.contactController.getEmailAddress(), this.contactController.getEmailAddressRepeat())) {
+ // Is not same email address
+ throw new IllegalArgumentException("Both entered email addresses don't match.");
+ }
+ }
// Set user name, CONFIRMED and INVISIBLE
- localUser.setUserName(this.getUserName());
- localUser.setUserAccountStatus(UserAccountStatus.CONFIRMED);
- localUser.setUserProfileMode(ProfileMode.INVISIBLE);
+ user.setUserName(this.getUserName());
+ user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
+ user.setUserProfileMode(ProfileMode.INVISIBLE);
+
+ // Init instance
+ Contact contact;
- // Create contact instance
- Contact contact = this.contactController.createContactInstance();
+ // Is a contact instance in helper set?
+ if (this.beanHelper.getContact() instanceof Contact) {
+ // Then use it for contact linking
+ contact = this.beanHelper.getContact();
+ } else {
+ // Create contact instance
+ contact = this.contactController.createContactInstance();
+ }
// Set contact in user
- localUser.setUserContact(contact);
+ user.setUserContact(contact);
// 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(localUser)) {
+ if (this.userController.isUserNameRegistered(user)) {
// User name is already used
- throw new FaceletException(new UserNameAlreadyRegisteredException(localUser));
- } else if (this.contactController.isEmailAddressRegistered(localUser.getUserContact())) {
+ 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(localUser));
+ throw new FaceletException(new EmailAddressAlreadyRegisteredException(user));
} else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) {
// Empty password entered, then generate one
password = UserUtils.createRandomPassword(PizzaUserWebSessionController.MINIMUM_PASSWORD_LENGTH);
} else if (!this.isSamePasswordEntered()) {
// Both passwords don't match
- throw new FaceletException(new UserPasswordRepeatMismatchException(localUser));
+ throw new FaceletException(new UserPasswordRepeatMismatchException(user));
} else {
// Both match, so get it from this bean
password = this.getUserPassword();
@@ -164,41 +265,154 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
assert (password.length() >= PizzaUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N
// Encrypt password and set it
- localUser.setUserEncryptedPassword(UserUtils.encryptPassword(password));
-
- // Init updated user instance
- User updatedUser = null;
+ user.setUserEncryptedPassword(UserUtils.encryptPassword(password));
try {
// Now, that all is set, call EJB
- updatedUser = this.userBean.addUser(localUser);
+ if (this.beanHelper.getContact() instanceof Contact) {
+ // Link contact with this 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
+ User updatedUser = this.adminUserBean.addUser(user);
+
+ // Fire event
+ this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser));
+ }
} catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
// Throw again
throw new FaceletException(ex);
}
- // Fire event
- this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser));
+ // Clear this bean
+ this.clear();
+
+ // Return to user list (for now)
+ return "admin_list_user"; //NOI18N
+ }
+
+ @Override
+ public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
+ // Trace message
+ //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
+
+ // event should not be null
+ if (null == event) {
+ // Throw NPE
+ throw new NullPointerException("event is null"); //NOI18N
+ } else if (event.getRegisteredUser() == null) {
+ // Throw NPE again
+ throw new NullPointerException("event.user is null"); //NOI18N
+ } else if (event.getRegisteredUser().getUserId() == null) {
+ // userId is null
+ throw new NullPointerException("event.user.userId is null"); //NOI18N
+ } else if (event.getRegisteredUser().getUserId() < 1) {
+ // Not avalid id
+ throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getRegisteredUser(), event.getRegisteredUser().getUserId())); //NOI18N
+ }
- // Add user to local list
- this.userList.add(updatedUser);
+ // Get user instance
+ User registeredUser = event.getRegisteredUser();
- // Clear all
+ // Debug message
+ //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N
+
+ // Clear all data
this.clear();
- // Clear contact instance
- this.contactController.clear();
+ // Trace message
+ //* NOISY-DEBUG: */ System.out.println("AdminUserWebBean:afterRegistration: EXIT!"); //NOI18N
+ }
+
+ @Override
+ 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) {
+ // Throw NPE
+ throw new NullPointerException("beanHelper.user is null"); //NOI18N
+ } else if (user.getUserId() == null) {
+ // Throw NPE again
+ throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N //NOI18N
+ } else if (user.getUserId() < 1) {
+ // Invalid id
+ throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N //NOI18N
+ } else if (this.getUserName() == null) {
+ // Not all required fields are set
+ throw new NullPointerException("this.userName is null"); //NOI18N
+ } else if (this.getUserName().isEmpty()) {
+ // 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
+ this.setUserPassword(null);
+ this.setUserPasswordRepeat(null);
+
+ // Throw exception
+ throw new FaceletException("Not same password entered"); //NOI18N
+ } else if (this.userBean.ifUserNameExists(this.getUserName())) {
+ // User name already exists
+ throw new FaceletException(new UserNameAlreadyRegisteredException(this.getUserName()));
+ } else if (this.isSamePasswordEntered()) {
+ // Same password entered, create container
+ if (UserUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword()))) {
+ // Same password entered
+ throw new FaceletException("Same password as stored entered."); //NOI18N
+ }
+
+ // Encrypt password
+ encryptedPassword = UserUtils.encryptPassword(this.getUserPassword());
+ }
+
+ // Set user name and flag
+ user.setUserName(this.getUserName());
+ user.setUserMustChangePassword(this.getUserMustChangePassword());
+
+ // Is a password set?
+ if (encryptedPassword != null) {
+ // Set it as well
+ user.setUserEncryptedPassword(encryptedPassword);
+ }
+
+ // Call EJB for updating user data
+ User updatedUser = this.userBean.updateUserData(user);
+
+ // Fire event
+ this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser));
+
+ // Return to user list (for now)
+ return "admin_list_user"; //NOI18N
+ }
+
+ @Override
+ public String getUserLockReason () {
+ return this.userLockReason;
+ }
+
+ @Override
+ public void setUserLockReason (final String userLockReason) {
+ this.userLockReason = userLockReason;
}
@Override
- public List allUsers () {
- // Return it
- return Collections.unmodifiableList(this.userList);
+ public Boolean getUserMustChangePassword () {
+ return this.userMustChangePassword;
}
@Override
- public void editUserData () {
- throw new UnsupportedOperationException("Not supported yet."); //NOI18N
+ public void setUserMustChangePassword (final Boolean userMustChangePassword) {
+ this.userMustChangePassword = userMustChangePassword;
}
@Override
@@ -232,64 +446,91 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
}
@Override
- public boolean hasUsers () {
- return (!this.allUsers().isEmpty());
- }
+ 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
+ }
- /**
- * Post-initialization of this class
- */
- @PostConstruct
- public void init () {
- // Initialize user list
- this.userList = this.userBean.allUsers();
+ try {
+ // Get base URL
+ String baseUrl = FacesUtils.generateBaseUrl();
+
+ // Call EJB to lock account
+ this.adminUserBean.lockUserAccount(user, this.getUserLockReason(), baseUrl);
+ } 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
}
@Override
- public User lookupUserById (final Long userId) throws UserNotFoundException {
- // Parameter must be valid
- if (null == userId) {
+ public String unlockUserAccount (final User user) {
+ // Is the user instance valid and CONFIRMED?
+ if (null == user) {
// Throw NPE
- throw new NullPointerException("userId is null"); //NOI18N
- } else if (userId < 1) {
- // Not valid
- throw new IllegalArgumentException(MessageFormat.format("userId={0} is not valid.", userId)); //NOI18N
+ 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.CONFIRMED) {
+ // User account is locked
+ throw new FacesException(new UserStatusConfirmedException(user));
+ } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
+ // User account is locked
+ throw new FaceletException(new UserStatusUnconfirmedException(user));
}
- // Init variable
- User user = null;
-
- // Try to lookup it in visible user list
- for (final Iterator iterator = this.userList.iterator(); iterator.hasNext();) {
- // Get next user
- User next = iterator.next();
-
- // Is the user id found?
- if (Objects.equals(next.getUserId(), userId)) {
- // Copy to other variable
- user = next;
- break;
- }
- }
+ try {
+ // Get base URL
+ String baseUrl = FacesUtils.generateBaseUrl();
- // Is it still null?
- if (null == user) {
- // Not visible for the current user
- throw new UserNotFoundException(userId);
+ // Call EJB to unlock account
+ this.adminUserBean.unlockUserAccount(user, baseUrl);
+ } catch (final UserStatusConfirmedException | UserStatusUnconfirmedException | UserNotFoundException ex) {
+ // Throw again
+ throw new FaceletException(ex);
}
- // Return it
- return user;
+ // Should go fine at this point, redirect to user profile
+ return "admin_show_user?faces-redirect=true&includeViewParams=true"; //NOI18N
}
/**
* Clears this bean
*/
private void clear () {
- // Clear all
+ // Clear all data
+ // - other data
this.setUserName(null);
this.setUserPassword(null);
this.setUserPasswordRepeat(null);
+ this.setUserMustChangePassword(null);
}
/**