Changeset 763289e

Timestamp:

10/31/22 23:42:15 (2 years ago)

Author:

Gjoko <goko_kostadinov@…>

Branches:

master

Children:

044bd76

Parents:

204464d

Message:

Fix security

Location:

src/main

Files:

• java/edu/gjoko/schedlr/config/AppSecurityConfig.java (modified) (2 diffs)
• java/edu/gjoko/schedlr/controllers/HomePageController.java (modified) (1 diff)
• java/edu/gjoko/schedlr/controllers/LoginController.java (modified) (1 diff)
• java/edu/gjoko/schedlr/controllers/RegisterController.java (modified) (2 diffs)
• java/edu/gjoko/schedlr/services/PostgresUserDetailsService.java (modified) (2 diffs)
• resources/templates/homepage.html (modified) (1 diff)
• resources/templates/login.html (modified) (1 diff)

src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java

@@ -46 +46 @@
                 .disable()
                 .authorizeRequests()
-                .antMatchers("/login*").permitAll()
+                .antMatchers("/login").permitAll()
                 .antMatchers("/register_customer").permitAll()
                 .antMatchers("/register_business").permitAll()
+                .antMatchers("/homepage").permitAll()
                 .antMatchers("/css/**").permitAll()
                 .antMatchers("/anonymous*").anonymous()
@@ -61 +62 @@
                 .loginPage("/login")
                 .loginProcessingUrl("/login")
-                .successHandler(authenticationSuccessHandler);
+                .successHandler(authenticationSuccessHandler)
+                .defaultSuccessUrl("/homepage");
     }
 }

src/main/java/edu/gjoko/schedlr/controllers/HomePageController.java

@@ -4 +4 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController(value = "/homepage")
 public class HomePageController {
 
-    @GetMapping(value = "/homepage")
+    @GetMapping
     public String getHomePageTemplate(Model model) {
         return "homepage";
     }
+
+    @PostMapping
+    public String postHomePageTemplate(Model model) {
+        return "homepage";
+    }
 }

src/main/java/edu/gjoko/schedlr/controllers/LoginController.java

@@ -1 +1 @@
 package edu.gjoko.schedlr.controllers;
 
+import edu.gjoko.schedlr.entity.Stakeholder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
 public class LoginController {
 
-    @GetMapping(value = "/login")
+    @GetMapping(path = "/login")
     public String getMapping(Model model) {
+        model.addAttribute("stakeholder", new Stakeholder());
         return "login";
     }
+
+    @PostMapping(path = "/login")
+    public String loginCustomer(@ModelAttribute Stakeholder customer, Model model) {
+        return "redirect:homepage";
+    }
 }

src/main/java/edu/gjoko/schedlr/controllers/RegisterController.java

@@ -20 +20 @@
     }
 
-    @GetMapping("/register_customer")
+    @GetMapping(value ="/register_customer")
     public String getCustomerRegisterPage(Model model) {
         model.addAttribute("stakeholder", new Stakeholder());
@@ -30 +30 @@
         Stakeholder user = stakeholderService.saveStakeholder(customer);
         model.addAttribute("user", user);
-        return "homepage";
+        return "redirect:homepage";
     }
 
-    @GetMapping("/register_business")
+    @GetMapping(value = "/register_business")
     public String getBusinessRegisterPage(Model model) {
         return "register_business";
     }
 
-    @PostMapping("/register_business")
+    @PostMapping(value = "/register_business")
     public String registerBusiness(Model model) {
         return "register_business";

src/main/java/edu/gjoko/schedlr/services/PostgresUserDetailsService.java

@@ -9 +9 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -18 +19 @@
 
     private final StakeholderRepository stakeholderRepository;
+    private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
-    public PostgresUserDetailsService(StakeholderRepository stakeholderRepository) {
+    public PostgresUserDetailsService(StakeholderRepository stakeholderRepository,
+                                      BCryptPasswordEncoder bCryptPasswordEncoder) {
         this.stakeholderRepository = stakeholderRepository;
+        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
     }
 

src/main/resources/templates/homepage.html

@@ -3 +3 @@
 <head>
     <meta charset="UTF-8">
-    <title>Title</title>
+    <title>Homepage</title>
 </head>
 <body>

src/main/resources/templates/login.html

@@ -40 +40 @@
                 <div class="card">
                     <div class="card-body py-5 px-md-5">
-                        <form>
+                        <form action="#" th:action="@{/login}" th:object="${stakeholder}" method="post">
                             <!-- Email input -->
                             <div class="form-outline mb-4">
-                                <input type="email" id="email" class="form-control"/>
-                                <label class="form-label" for="email">Email address</label>
+                                <input type="text" id="username" class="form-control" required th:field="*{username}" />
+                                <label class="form-label" for="username">Username</label>
                             </div>
 
                             <!-- Password input -->
                             <div class="form-outline mb-4">
-                                <input type="password" id="password" class="form-control"/>
+                                <input type="password" id="password" class="form-control" th:field="*{password}" />
                                 <label class="form-label" for="password">Password</label>
                             </div>