Changeset cc88ec2 for src

Timestamp:

02/09/23 14:57:39 (21 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

17a2fda

Parents:

ff75720

Message:

updates to login

Location:

src/main/java/com/example/moviezone

Files:

• config/CustomUsernamePasswordAuthenticationProvider.java (modified) (1 diff)
• web/HomeController.java (modified) (3 diffs)

src/main/java/com/example/moviezone/config/CustomUsernamePasswordAuthenticationProvider.java

@@ -35 +35 @@
 
         UserDetails userDetails = this.userService.findByUsername(username);
-        String realPassword = userDetails.getPassword();
-        if (!Objects.equals(password,realPassword)) {
+//        String realPassword = userDetails.getPassword();
+        if (!Objects.equals(password,userDetails.getPassword())) {
             throw new BadCredentialsException("Password is incorrect!");
         }

src/main/java/com/example/moviezone/web/HomeController.java

@@ -5 +5 @@
 import com.example.moviezone.model.exceptions.PasswordsDoNotMatchException;
 
+import com.example.moviezone.model.exceptions.UserNotFoundException;
 import com.example.moviezone.model.manytomany.ProjectionIsPlayedInRoom;
 
@@ -15 +16 @@
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.transaction.Transactional;
@@ -135 +137 @@
     @PostMapping("/login")
     public String login(@RequestParam String username,
-                        @RequestParam String password,Model model, HttpSession session)
+                        @RequestParam String password, Model model, HttpServletRequest request)
     {
 //        User user = null;
-//        try {
+        try {
            User user=userService.login(username,password);
         System.out.println(user.getFirst_name());
-//            session.setAttribute("sessionUser",user);
-//            model.addAttribute("user",user);
+        request.getSession().setAttribute("user", user);
+        //            model.addAttribute("user",user);
             return "redirect:/home";
-//
-//        }catch (UserNotFoundException e)
-//        {
-//            model.addAttribute("hasError", true);
-//            model.addAttribute("error", e.getMessage());
-//            return "login";
-//        }
+
+        }catch (UserNotFoundException e)
+        {
+            model.addAttribute("hasError", true);
+            model.addAttribute("error", e.getMessage());
+            return "/login";
+        }
 
     }