logout function

enhan · May 28, 2012 · 883a8eb · 883a8eb
1 parent ddde5ab
commit 883a8eb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/src/main/java/eu/enhan/timelord/web/controller/IndexController.java b/src/main/java/eu/enhan/timelord/web/controller/IndexController.java
@@ -16,10 +16,15 @@
  */
 package eu.enhan.timelord.web.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import eu.enhan.timelord.domain.core.TimelordUser;
+import eu.enhan.timelord.domain.security.TimelordUserDetailsService;
+
 /**
  * @author Emmanuel Nhan
  *
@@ -28,9 +33,16 @@
 @RequestMapping("/")
 public class IndexController {
 
+    @Autowired
+    TimelordUserDetailsService userService;
+
     @RequestMapping(method=RequestMethod.GET)
     public String index(){
 	return "index";
     }
 
+
+    @ModelAttribute("user") public TimelordUser getUser(){
+	return userService.getUserFromSession(); 
+    }
 }
diff --git a/src/main/resources/spring/security.xml b/src/main/resources/spring/security.xml
@@ -9,8 +9,8 @@
 
 	<security:http auto-config="true" >
 		<security:intercept-url pattern="/admin/**" access="ROLE_ADMIN"/>
-		<security:form-login login-page="/" default-target-url="/"/>
-
+		<security:form-login login-page="/" default-target-url="/" login-processing-url="/auth/login"/>
+		<security:logout logout-success-url="/" invalidate-session="true" logout-url="/auth/logout"/>
 	</security:http>
 
 	<security:authentication-manager>

diff --git a/src/main/webapp/WEB-INF/view/common/header.jspf b/src/main/webapp/WEB-INF/view/common/header.jspf
@@ -1,5 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 
 <!-- NAV bar -->
 <div class="navbar navbar-fixed-top">
@@ -11,13 +13,24 @@
 				<li><a href="#">Register</a></li>
 				<li><a href="#">About</a></li>
 			</ul>
-
-			<form action="/timelord/j_spring_security_check" method="post" class="navbar-form pull-right">
-				<input type="text" class="span2" placeholder="login" id="j_username" name="j_username"/>
-				<input type="password" class="span2" placeholder="password" id="j_password" name="j_password" />
-				<button type="submit" class="btn btn-primary">Login</button>
-			</form>
-
+			<c:choose>
+				<c:when test="${empty user }">
+					<c:url var="loginUrl" value="/auth/login"/>		
+					<form action="${loginUrl }" method="post" class="navbar-form pull-right">
+						<input type="text" class="span2" placeholder="login" id="j_username" name="j_username"/>
+						<input type="password" class="span2" placeholder="password" id="j_password" name="j_password" />
+						<button type="submit" class="btn btn-primary">Login</button>
+					</form>
+				</c:when>
+				<c:otherwise>
+					<c:url var="logoutUrl" value="/auth/logout"/>
+					<ul class="nav pull-right">
+						<li><a>Welcome ${user.login } !</a></li>
+						<li class="divider-vertical"></li>
+						<li><a href="${logoutUrl }">Logout</a></li>
+					</ul>
+				</c:otherwise>
+			</c:choose>
 		</div>
 	</div>
 </div>