Continued a bit: (please cherry-pick)

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / login / JobsUserLoginWebSessionBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
index aeaeaaac2c9decd4f5baa77de9d5186290ae5c86..31a76019d22ce9fa71009e4270e79dcecb0104ea 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
@@ -26,6 +26,8 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jjobs.beans.BaseJobsController;
+import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
 import org.mxchange.jusercore.container.login.LoginContainer;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
@@ -39,7 +41,6 @@ import org.mxchange.jusercore.model.user.User;
 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.user.JobsUserWebSessionController;
 
 /**
  * A web bean for user registration
@@ -48,7 +49,7 @@ import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
  */
 @Named ("loginController")
 @SessionScoped
-public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionController {
+public class JobsUserLoginWebSessionBean extends BaseJobsController implements JobsUserLoginWebSessionController {
 
        /**
         * Serial number
@@ -103,7 +104,7 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.loginBean = (UserLoginSessionBeanRemote) context.lookup("ejb/stateless-jjobs-login"); //NOI18N
+                       this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/jjobs-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);
@@ -113,7 +114,7 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
        @Override
        public String doLogin () {
                // Get user instance
-               User user = this.userController.createUserInstance();
+               User user = this.userController.createUserLogin();
 
                // Create login container
                LoginContainer container = new UserLoginContainer(user, this.userController.getUserPassword());
@@ -141,7 +142,7 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
 
        @Override
        public String getCurrentPassword () {
-               return currentPassword;
+               return this.currentPassword;
        }
 
        @Override
@@ -188,8 +189,8 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
        }
 
        @Override
-       public boolean isGuest () {
-               return (!this.isUserLoggedIn());
+       public boolean ifUserMustChangePassword () {
+               return (this.isUserLoggedIn() && this.getLoggedInUser().getUserMustChangePassword());
        }
 
        @Override
@@ -217,4 +218,5 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
                // Return it
                return this.userLoggedIn;
        }
+
 }