From 66dd2307565d97253a2b1f5f6ab79f2eef44f3bb Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Tue, 11 Apr 2017 16:07:16 -0400
Subject: [PATCH] User Automatic Logout

If a user is idle on the system it will now automatically log them out
and redirect them to the login page, rather than a crummy error page.
---
 WebContent/html/webpages/navbar.jsp           | 24 +++++++++++++++----
 .../html/webpages/ticketAdminRedirect.jsp     |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
index a999ed3..ab6850c 100644
--- a/WebContent/html/webpages/navbar.jsp
+++ b/WebContent/html/webpages/navbar.jsp
@@ -25,15 +25,29 @@
 	</div>
 	<%
 	Cookie[] usercookies = request.getCookies();
-	int navsso = 0;
+	String navsso = "invalid";
+	String navname = "error";
+	Cookie newCookie;
+	//iterate cookies
+	System.out.println("Cookies:\n----------\n");
 	for(Cookie c : usercookies){
-		if(c.getName().equals("ssoNum")){
-			navsso = Integer.parseInt(c.getValue());
+	System.out.println(c.getName());
+		if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it
+			navsso = c.getValue(); 
+			c.setMaxAge(0);//delete current
+			newCookie = new Cookie("ssoNum",navsso);//make new one
+			newCookie.setMaxAge(30*60);
+			response.addCookie(newCookie);
 			break;
 		}
 	}
-	User self = EmployeeQueries.getEmployeeByID(navsso);
-	String navname = self.getName();
+	System.out.println("\nnavsso = "+navsso+"\n");
+	if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
+		response.sendRedirect("../../index.jsp");
+	else{
+	User self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso));
+	navname = self.getName();
+	}
 	%>
 </div>
 <script>
diff --git a/WebContent/html/webpages/ticketAdminRedirect.jsp b/WebContent/html/webpages/ticketAdminRedirect.jsp
index caf87c7..9a60000 100644
--- a/WebContent/html/webpages/ticketAdminRedirect.jsp
+++ b/WebContent/html/webpages/ticketAdminRedirect.jsp
@@ -38,7 +38,7 @@ int locationid = Integer.parseInt(locationidstr);
 
 //add form was submitted
 if(request.getParameter("approve") != null){
-  TicketQueries.acceptTicket(ticketid,deviceid,locationid,navsso);
+  TicketQueries.acceptTicket(ticketid,deviceid,locationid,Integer.parseInt(navsso));
 }
 //modify form was submitted
 if(request.getParameter("reject") != null){