implement user login

2 files changed, 3 insertions, 23 deletions

diff --git a/backend/src/main/java/com/blog/web/controllers/AuthController.java b/backend/src/main/java/com/blog/web/controllers/AuthController.java
index 1f854c3..a870086 100644
--- a/backend/src/main/java/com/blog/web/controllers/AuthController.java
+++ b/backend/src/main/java/com/blog/web/controllers/AuthController.java
@@ -19,22 +19,6 @@ public class AuthController {
         this.userService = userService;
     }
 
-    @GetMapping("/userlogin")
-    public String login(Model model) {
-        final UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
-        model.addAttribute("user", user);
-        return "auth/login";
-    }
-
-    /*
-    @GetMapping("/register")
-    public String getRegisterForm(Model model) {
-        final RegistrationDto user = new RegistrationDto();
-        model.addAttribute("user", user);
-        return "auth/register";
-    }
-    */
-
     //@PostMapping("/register/save")
     @PostMapping("/register")
     public RegistrationDto register(@Valid @ModelAttribute("user") RegistrationDto user, BindingResult result) {
@@ -48,13 +32,9 @@ public class AuthController {
             result.rejectValue("username", "There is already a user with this username");
         }
 
-        if (result.hasErrors()) {
-            //model.addAttribute("user", user);
-            //return "register";
-            return user;
+        if (!result.hasErrors()) {
+            userService.saveUser(user);
         }
-        userService.saveUser(user);
-        //return "redirect:/articles?success";
         return user;
     }
 }
diff --git a/backend/src/main/java/com/blog/web/security/SecurityConfig.java b/backend/src/main/java/com/blog/web/security/SecurityConfig.java
index 17e09c7..2be6909 100644
--- a/backend/src/main/java/com/blog/web/security/SecurityConfig.java
+++ b/backend/src/main/java/com/blog/web/security/SecurityConfig.java
@@ -28,7 +28,7 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         // disabling csrf leaves us vulnerable, in a real production app do not do this
-        http.csrf(c -> c.disable()).cors(c -> c.disable()).authorizeHttpRequests(auths -> auths.anyRequest().permitAll()).formLogin(form -> form.loginPage("/userlogin").usernameParameter("username").passwordParameter("password").defaultSuccessUrl("/articles").loginProcessingUrl("/userlogin").failureUrl("/userlogin?error=true").permitAll()).logout(logout -> logout.logoutUrl("/logout").logoutSuccessUrl("/articles"));
+        http.csrf(c -> c.disable()).cors(c -> c.disable()).authorizeHttpRequests(auths -> auths.anyRequest().permitAll()).formLogin(form -> form.loginPage("/login").usernameParameter("username").passwordParameter("password").defaultSuccessUrl("/").loginProcessingUrl("/userlogin").failureUrl("/userlogin?error=true").permitAll()).logout(logout -> logout.logoutUrl("/logout").logoutSuccessUrl("/articles"));
         return http.build();
     }