From: Roland Haeder <roland@mxchange.org>
Date: Tue, 13 Oct 2015 07:46:31 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=52291e610fec21cc656d468596397530ed278163;p=addressbook-war.git

Continued:
- added container for transfering user instance and unencrypted password
- updated jar(s)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index abd0ecf2..bf521fb3 100644
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ
diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar
index 1597aad6..b5dc6f08 100644
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ
diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java
index 9496db3d..a8ca0928 100644
--- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java
@@ -25,7 +25,10 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.addressbook.beans.user.UserWebController;
+import org.mxchange.jusercore.container.login.LoginContainer;
+import org.mxchange.jusercore.container.login.UserLoginContainer;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
+import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
 import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException;
 import org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote;
@@ -83,19 +86,22 @@ public class UserLoginWebBean implements UserLoginWebController {
 		// Get user instance
 		User user = this.userController.createUserInstance();
 
+		// Create login container
+		LoginContainer container = new UserLoginContainer(user, this.userController.getUserPassword());
+
 		try {
 			// Call bean
-			User confirmedUser = this.loginBean.validateUserAccountStatus(user);
+			User confirmedUser = this.loginBean.validateUserAccountStatus(container);
 
 			// All fine here so set it here
 			this.setLoggedInUser(confirmedUser);
-		} catch (final UserNotFoundException | UserStatusLockedException | UserStatusUnconfirmedException ex) {
+
+			// All fine
+			return "login"; //NOI18N
+		} catch (final UserNotFoundException | UserStatusLockedException | UserStatusUnconfirmedException | UserPasswordMismatchException ex) {
 			// Throw again
 			throw new FaceletException(ex);
 		}
-
-		// All fine
-		return "login"; //NOI18N
 	}
 
 	@Override