From: Roland Haeder <roland@mxchange.org>
Date: Thu, 28 Jul 2016 20:06:29 +0000 (+0200)
Subject: re-added doUserLogout() + removed doLogout() as it was to generic
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=751175a83af13f1a1ae56af3776f17042c3529c0;p=jjobs-war.git

re-added doUserLogout() + removed doLogout() as it was to generic

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
index 473f2db5..9bf9bb7c 100644
--- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
@@ -38,6 +38,7 @@ import org.mxchange.jusercore.container.login.UserLoginContainer;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.events.login.UserLoginEvent;
 import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent;
+import org.mxchange.jusercore.events.logout.UserLogoutEvent;
 import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
@@ -239,6 +240,34 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
 		}
 	}
 
+	@Override
+	public String doUserLogout () {
+		// Is loggedInUser set?
+		if (this.getLoggedInUser() == null) {
+			// Throw NPE
+			throw new NullPointerException("this.loggedInUser is null"); //NOI18N
+		} else if (this.getLoggedInUser().getUserId() == null) {
+			// Throw again
+			throw new NullPointerException("this.loggedInUser.userId is null"); //NOI18N
+		} else if (this.getLoggedInUser().getUserId() < 1) {
+			// Invalid user id
+			throw new IllegalStateException(MessageFormat.format("this.loggedInUser.userId={0} is not valid.", this.getLoggedInUser().getUserId())); //NOI18N
+		}
+
+		// Fire event
+		this.userLogoutEvent.fire(new UserLogoutEvent(this.getLoggedInUser()));
+
+		// Invalidate session
+		FacesContext.getCurrentInstance().getExternalContext().invalidateSession();
+
+		// Unset any user instances
+		this.setLoggedInUser(null);
+		this.setBaseTemplatePathName(GUEST_BASE_TEMPLATE_NAME); //NOI18N
+
+		// Redirect to index
+		return "index"; //NOI18N
+	}
+
 	@Override
 	public String getBaseTemplatePathName () {
 		return this.baseTemplatePathName;