From eb2a958bacf72e62f8c6fe9e37bcf66e1d3f812b Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Thu, 15 Jun 2017 15:44:45 +0200
Subject: [PATCH] Redirections added (leave-session template not necessary)

---
 .../main/java/io/openvidu/mvc/java/App.java   | 10 +++---
 .../io/openvidu/mvc/java/LoginController.java | 33 ++++++++-----------
 .../io/openvidu/mvc/java/MainController.java  | 15 ---------
 .../openvidu/mvc/java/SessionController.java  |  8 ++---
 .../main/resources/templates/dashboard.html   |  3 +-
 .../resources/templates/leave-session.html    | 18 ----------
 6 files changed, 23 insertions(+), 64 deletions(-)
 delete mode 100644 openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/MainController.java
 delete mode 100644 openvidu-mvc-java/src/main/resources/templates/leave-session.html

diff --git a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/App.java b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/App.java
index a8daa961..1c2e5ce8 100644
--- a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/App.java
+++ b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/App.java
@@ -4,11 +4,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class App 
-{
-	public static void main( String[] args )
-    {
-    	SpringApplication.run(App.class, args);
-    }
+public class App {
+	public static void main(String[] args) {
+		SpringApplication.run(App.class, args);
+	}
 
 }
diff --git a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/LoginController.java b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/LoginController.java
index b353f887..1f34533f 100644
--- a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/LoginController.java
+++ b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/LoginController.java
@@ -37,6 +37,16 @@ public class LoginController {
 		users.put("subscriber", new MyUser("subscriber", "pass", OpenViduRole.SUBSCRIBER));
 	}
 
+	@RequestMapping(value = "/")
+	public String logout(HttpSession httpSession) {
+		if (checkUserLogged(httpSession)) {
+			return "redirect:/dashboard";
+		} else {
+			httpSession.invalidate();
+			return "index";
+		}
+	}
+
 	@RequestMapping(value = "/dashboard", method = { RequestMethod.GET, RequestMethod.POST })
 	public String login(@RequestParam(name = "user", required = false) String user,
 			@RequestParam(name = "pass", required = false) String pass, Model model, HttpSession httpSession) {
@@ -53,33 +63,18 @@ public class LoginController {
 			model.addAttribute("username", user);
 			return "dashboard";
 		} else {
-			return "index";
+			return "redirect:/";
 		}
 	}
 
-	@RequestMapping(value = "/", method = RequestMethod.GET)
+	@RequestMapping(value = "/logout", method = RequestMethod.POST)
 	public String logout(Model model, HttpSession httpSession) {
-		if (checkUserLogged(httpSession)) {
-			model.addAttribute("username", httpSession.getAttribute("loggedUser"));
-			return "dashboard";
-		}
 		httpSession.invalidate();
-		return "index";
-	}
-
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public String logout(@RequestParam(name = "islogout", required = false) String islogout, HttpSession httpSession) {
-		if (checkUserLogged(httpSession) && islogout.equals("true")){
-			System.out.println("'" + httpSession.getAttribute("loggedUser") + "' has logged out");
-			httpSession.invalidate();
-		}
-		return "index";
+		return "redirect:/";
 	}
 
 	private boolean login(String user, String pass) {
-		return (user != null && 
-				pass != null && 
-				users.containsKey(user) && users.get(user).pass.equals(pass));
+		return (user != null && pass != null && users.containsKey(user) && users.get(user).pass.equals(pass));
 	}
 
 	private boolean checkUserLogged(HttpSession httpSession) {
diff --git a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/MainController.java b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/MainController.java
deleted file mode 100644
index 934127c5..00000000
--- a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/MainController.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.openvidu.mvc.java;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class MainController {
-
-	@RequestMapping(value = "/")
-	public String index(Model model) {
-		return "index";
-	}
-
-}
\ No newline at end of file
diff --git a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java
index f1015bba..28a35c53 100644
--- a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java
+++ b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java
@@ -118,18 +118,18 @@ public class SessionController {
 						System.out.println(sessionName + " empty!");
 					}
 					model.addAttribute("sessionId", sessionId);
-					return "leave-session";
+					return "redirect:/dashboard";
 				} else {
 					System.out.println("Problems in the app server: the TOKEN wasn't valid");
-					return "leave-session";
+					return "redirect:/dashboard";
 				}
 			} else {
 				System.out.println("Problems in the app server: the SESSIONID wasn't valid");
-				return "leave-session";
+				return "redirect:/dashboard";
 			}
 		} else {
 			System.out.println("Problems in the app server: the SESSION does not exist");
-			return "leave-session";
+			return "redirect:/dashboard";
 		}
 	}
 
diff --git a/openvidu-mvc-java/src/main/resources/templates/dashboard.html b/openvidu-mvc-java/src/main/resources/templates/dashboard.html
index c4da1716..7c88c307 100644
--- a/openvidu-mvc-java/src/main/resources/templates/dashboard.html
+++ b/openvidu-mvc-java/src/main/resources/templates/dashboard.html
@@ -23,8 +23,7 @@
 		</p>
 	</form>
 	<p>
-		<form action="/" method="post">
-			<input type="hidden" name="islogout" value="true"></input>
+		<form action="/logout" method="post">
 			<button type="submit">Log out</button>
 		</form>
 	</p>
diff --git a/openvidu-mvc-java/src/main/resources/templates/leave-session.html b/openvidu-mvc-java/src/main/resources/templates/leave-session.html
deleted file mode 100644
index 7fb2708f..00000000
--- a/openvidu-mvc-java/src/main/resources/templates/leave-session.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-	<meta charset="UTF-8"></meta>
-	<title>OpenVidu Demo Java MVC Secure</title>
-</head>
-
-<body>Leaving session...
-</body>
-
-<script src="OpenVidu.js"></script>
-
-<script>
-	window.location.href = '/dashboard';
-</script>
-
-</html>
\ No newline at end of file