#116 - redirect to /admin if the user is already logged in

(cherry picked from commit d96e7e2)
alfio-event · Apr 7, 2016 · d10573c · d10573c
1 parent feb2957
commit d10573c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/alfio/config/WebSecurityConfig.java b/src/main/java/alfio/config/WebSecurityConfig.java
@@ -138,7 +138,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .and()
                 .formLogin()
                 .loginPage("/authentication")
-                .loginProcessingUrl("/authentication")
+                .loginProcessingUrl("/authenticate")
                 .failureUrl("/authentication?failed");
         }
     }

diff --git a/src/main/java/alfio/controller/LoginController.java b/src/main/java/alfio/controller/LoginController.java
@@ -22,18 +22,25 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.security.Principal;
+
 @Controller
 public class LoginController {
 
+    private static final String REDIRECT_ADMIN = "redirect:/admin/";
+
     @RequestMapping(value="/authentication", method = RequestMethod.GET)
-    public String getLoginPage(@RequestParam(value="failed", required = false) String failed, Model model) {
+    public String getLoginPage(@RequestParam(value="failed", required = false) String failed, Model model, Principal principal) {
+        if(principal != null) {
+            return REDIRECT_ADMIN;
+        }
         model.addAttribute("failed", failed != null);
         return "/login/login";
     }
 
-    @RequestMapping(value="/authentication", method = RequestMethod.POST)
+    @RequestMapping(value="/authenticate", method = RequestMethod.POST)
     public String doLogin() {
-        return "redirect:/admin/";
+        return REDIRECT_ADMIN;
     }
 
 }
diff --git a/src/main/webapp/WEB-INF/templates/login/login.ms b/src/main/webapp/WEB-INF/templates/login/login.ms
@@ -13,7 +13,7 @@
     <div class="container">
         <div class="row">
             <div class="col-sm-10 col-sm-push-1 col-xs-12 col-md-6 col-md-push-3">
-                <form role="form" name="loginForm" action="{{request.contextPath}}/authentication" method="post">
+                <form role="form" name="loginForm" action="{{request.contextPath}}/authenticate" method="post">
                     <input name="_csrf" type="hidden" value="{{_csrf.token}}" />
                     <div class="page-header">
                         <h2>Authentication requested</h2>