Completed registration back and front

Author: xPressed

src/main/java/ru/xpressed/javatemplatescoursework/config/SecurityConfig.java

@@ -26,11 +26,21 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http
-                .csrf().disable()
-                .cors().disable()
                 .authorizeRequests().antMatchers("/login", "/logout", "/registration").permitAll()
                 .anyRequest().authenticated()
+
                 .and().formLogin()
+                .loginPage("/login").permitAll()
+                .loginProcessingUrl("/perform-login")
+                .usernameParameter("username")
+                .passwordParameter("password")
+                .defaultSuccessUrl("/index", true)
+                .failureUrl("/login?error")
+
+                .and()
+                .logout()
+                .deleteCookies("JSESSIONID")
+
                 .and().userDetailsService(userDetailsService());
     }
 

src/main/java/ru/xpressed/javatemplatescoursework/controller/IndexController.java

@@ -0,0 +1,15 @@
+package ru.xpressed.javatemplatescoursework.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+public class IndexController {
+    @GetMapping("/index")
+    public String showIndexPage(HttpServletRequest request) {
+        System.out.println(request.getUserPrincipal().getName());
+        return "index";
+    }
+}

src/main/java/ru/xpressed/javatemplatescoursework/controller/LoginController.java

@@ -0,0 +1,12 @@
+package ru.xpressed.javatemplatescoursework.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class LoginController {
+    @GetMapping("/login")
+    public String showLoginForm() {
+        return "login";
+    }
+}

src/main/java/ru/xpressed/javatemplatescoursework/controller/LogoutController.java

@@ -0,0 +1,22 @@
+package ru.xpressed.javatemplatescoursework.controller;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+public class LogoutController {
+    @GetMapping("/logout")
+    public String executeLogout(HttpServletRequest request, HttpServletResponse response) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null) {
+            new SecurityContextLogoutHandler().logout(request, response, authentication);
+        }
+        return "redirect:/login?logout";
+    }
+}

src/main/java/ru/xpressed/javatemplatescoursework/controller/RegistrationController.java

@@ -3,12 +3,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import ru.xpressed.javatemplatescoursework.config.SecurityConfig;
 import ru.xpressed.javatemplatescoursework.entity.Customer;
 import ru.xpressed.javatemplatescoursework.repository.CustomerRepository;
 
+import javax.validation.Valid;
+
 @Controller
 public class RegistrationController {
     @Autowired
@@ -17,19 +20,31 @@ public class RegistrationController {
     SecurityConfig securityConfig;
 
     @GetMapping("/registration")
-    public String showRegistrationForm(Model model) {
-        model.addAttribute("user", new Customer());
+    public String showRegistrationForm(Customer customer, Model model) {
+        model.addAttribute("customer", new Customer());
         return "registration";
     }
 
     @PostMapping("/registration")
-    public String completeRegistration(Model model, Customer customer) {
+    public String completeRegistration(@Valid Customer customer, BindingResult bindingResult, Model model) {
+        if (bindingResult.hasErrors()) {
+            model.addAttribute("customer", customer);
+            return "registration";
+        }
+
+        if (!customer.getPassword().equals(customer.getRepeated())) {
+            model.addAttribute("reperr", "Passwords don't match!");
+            return "registration";
+        }
+
         if (customerRepository.findByUsername(customer.getUsername()) == null) {
             customer.setPassword(securityConfig.encoder().encode(customer.getPassword()));
             customerRepository.save(customer);
-            return "registrationCompleted";
+            model.addAttribute("message", "Registration Completed");
+            model.addAttribute("onload", "redirect()");
         } else {
-            return "registrationFailed";
+            bindingResult.rejectValue("username", "customer.username", "This username is already taken!");
         }
+        return "registration";
     }
 }

src/main/java/ru/xpressed/javatemplatescoursework/entity/Customer.java

@@ -1,11 +1,13 @@
 package ru.xpressed.javatemplatescoursework.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
 import java.util.Collection;
 
 @Entity
@@ -14,12 +16,16 @@
 @Setter
 public class Customer implements UserDetails {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
+    @NotEmpty(message = "Username can not be empty!")
     private String username;
+
+    @NotEmpty(message = "Password can not be empty!")
     private String password;
 
+    @Column(updatable = false, insertable = false)
+    @NotEmpty(message = "Repeated password can not be empty!")
+    private String repeated;
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return null;

…ources/templates/registrationFailed.html src/main/resources/templates/index.htmlsrc/main/resources/templates/registrationFailed.html renamed to src/main/resources/templates/index.html src/main/resources/templates/registrationFailed.html renamed to src/main/resources/templates/index.html

@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-Registration Failed!
+<h1>INDEX</h1>
 </body>
 </html>

src/main/resources/templates/login.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+<head>
+</head>
+<body>
+<div>
+    <form name="f" th:action="@{/perform-login}" method="post">
+        <fieldset>
+            <legend>Войдите</legend>
+            <div th:if="${param.error}" class="alert alert-error">
+                Неправильные имя и пароль.
+            </div>
+            <div th:if="${param.logout}" class="alert alert-success">
+                You have been logged out.
+            </div>
+            <label for="username">Имя</label>
+            <input type="text" id="username" name="username"/>
+            <label for="password">Пароль</label>
+            <input type="password" id="password" name="password"/>
+            <div class="form-actions">
+                <button type="submit" class="btn">Войти</button>
+            </div>
+        </fieldset>
+    </form>
+</div>
+</body>
+</html>

src/main/resources/templates/registration.html

@@ -1,38 +1,52 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-    <head>
-        <meta charset="ISO-8859-1">
-        <title>Sign Up - CodeJava</title>
-    </head>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <meta charset="UTF-8">
+    <title>Registration</title>
+    <script>
+        function redirect() {
+            setTimeout('location="/login";', 5000);
+        }
+    </script>
+</head>
+<body th:attr="onload=${onload}" style="background-color:  #dfdfe9;">
+    <div class="mt-5 pt-5 container-fluid">
+        <div class="row justify-content-center">
+            <div class="col-10 col-xl-5">
+                <div style="background-color: white; border-radius: 25px">
+                    <p class="text-center display-4">Registration</p>
 
-    <body>
-    <div class="container text-center">
-        <div>
-            <h1>User Registration - Sign Up</h1>
-        </div>
-        <form th:action="@{/registration}" th:object="${user}"
-              method="post" style="max-width: 600px; margin: 0 auto;">
-            <div class="m-3">
-                <div class="form-group row">
-                    <label class="col-4 col-form-label">Username: </label>
-                    <div class="col-8">
-                        <input th:field="*{username}" class="form-control" required />
-                    </div>
-                </div>
+                    <form action="#" th:action="@{/registration}" th:object="${customer}" method="post">
 
-                <div class="form-group row">
-                    <label class="col-4 col-form-label">Password: </label>
-                    <div class="col-8">
-                        <input type="password" th:field="*{password}" class="form-control"
-                               required minlength="6" maxlength="10"/>
-                    </div>
-                </div>
+                        <div class="mx-5 px-5 form-group form-group-lg">
+                            <label for="username" class="h4">Your Username</label>
+                            <input type="text" id="username" class="form-control input-lg" th:field="*{username}"/>
+                            <label for="username" th:if="${#fields.hasErrors('username')}" th:errors="*{username}" style="color: red"></label>
+                        </div>
+
+                        <div class="mx-5 px-5 form-group form-group-lg">
+                            <label for="password" class="h4">Password</label>
+                            <input type="password" id="password" class="form-control" th:field="*{password}"/>
+                            <label for="password" th:if="${#fields.hasErrors('password')}" th:errors="*{password}" style="color: red"></label>
+                        </div>
 
-                <div>
-                    <button type="submit" class="btn btn-primary">Sign Up</button>
+                        <div class="mx-5 px-5 form-group form-group-lg">
+                            <label for="repeat" class="h4">Repeat your password</label>
+                            <input type="password" id="repeat" class="form-control" th:field="*{repeated}" />
+                            <label for="repeat" th:if="${#fields.hasErrors('repeated')}" th:errors="*{repeated}" style="color: red"></label>
+                            <label for="repeat" style="color: red" th:text="${reperr}"></label>
+                        </div>
+
+                        <div class="d-flex justify-content-center m-3">
+                            <button type="submit" class="btn btn-primary btn-lg" style="background-color: #5700f7">Register</button>
+                        </div>
+                    </form>
+
+                    <p class="text-center h1 fw-bold m-3 pb-3" style="color: #5707f7" th:text="${message}">&nbsp</p>
                 </div>
             </div>
-        </form>
+        </div>
     </div>
-    </body>
+</body>
 </html>