1 files changed, 8 insertions, 18 deletions

diff --git a/src/main/java/com/blog/web/controllers/AuthController.java b/src/main/java/com/blog/web/controllers/AuthController.java
index a654ad1..efb3672 100644
--- a/src/main/java/com/blog/web/controllers/AuthController.java
+++ b/src/main/java/com/blog/web/controllers/AuthController.java
@@ -2,7 +2,6 @@ package com.blog.web.controllers;
 
 import com.blog.web.dto.RegistrationDto;
 import com.blog.web.models.UserEntity;
-import com.blog.web.security.SecurityUtil;
 import com.blog.web.services.UserService;
 import jakarta.validation.Valid;
 import org.apache.commons.lang3.StringUtils;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
 public class AuthController {
-    private UserService userService;
+    private final UserService userService;
 
     public AuthController(UserService userService) {
         this.userService = userService;
@@ -23,7 +22,7 @@ public class AuthController {
 
     @GetMapping("/userlogin")
     public String login(Model model) {
-        UserEntity user = userService.getLoggedInUser();
+        final UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
         model.addAttribute("user", user);
         return "auth/login";
     }
@@ -36,27 +35,18 @@ public class AuthController {
     }
 
     @PostMapping("/register/save")
-    public String register(@Valid @ModelAttribute("user")RegistrationDto user,
-                           BindingResult result,
-                           Model model) {
-        UserEntity existingUserEmail = userService.findByEmail(user.getEmail());
-        if(
-                existingUserEmail != null &&
-                        StringUtils.isBlank(existingUserEmail.getEmail())
-        ) {
+    public String register(@Valid @ModelAttribute("user") RegistrationDto user, BindingResult result, Model model) {
+        UserEntity existingUserEmail = userService.findByEmail(user.getEmail()).orElse(null);
+        if (existingUserEmail != null && StringUtils.isBlank(existingUserEmail.getEmail())) {
             result.rejectValue("email", "There is already a user with this email");
         }
 
-        UserEntity existingUsername = userService.findByUsername(user.getUsername());
-        if(
-                existingUsername != null &&
-                        StringUtils.isBlank(existingUsername.getUsername())
-        )
-        {
+        UserEntity existingUsername = userService.findByUsername(user.getUsername()).orElse(null);
+        if (existingUsername != null && StringUtils.isBlank(existingUsername.getUsername())) {
             result.rejectValue("username", "There is already a user with this username");
         }
 
-        if(result.hasErrors()) {
+        if (result.hasErrors()) {
             model.addAttribute("user", user);
             return "register";
         }