fix login for returning users

baloise-incubator · Oct 22, 2023 · 9cb76a3 · 9cb76a3
1 parent 6a93279
commit 9cb76a3
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/...ckend/src/main/java/com/baloise/collab/springbackend/security/RegistrationController.java b/...ckend/src/main/java/com/baloise/collab/springbackend/security/RegistrationController.java
@@ -1,17 +1,12 @@
 package com.baloise.collab.springbackend.security;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.java.Log;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
-import java.util.Objects;
-
 @RestController
 @RequiredArgsConstructor
 @Log
@@ -22,13 +17,14 @@ public class RegistrationController {
     private final PasswordEncoder encoder;
 
     @PostMapping("/user/registration")
-    public boolean registerUser(HttpServletRequest request, @RequestBody Credential credential) throws ServletException, IOException {
+    public boolean registerUser(@RequestBody Credential credential) {
 
         if (userDetailsManager.userExists(credential.username())) {
-            if(Objects.equals(userDetailsManager.loadUserByUsername(credential.username()).getPassword(), credential.password())){
-                log.info("User already exists + password is correct - returning okey");
+            if(encoder.matches(credential.password(), userDetailsManager.loadUserByUsername(credential.username()).getPassword())){
+                log.info(credential.username() + " User already exists + password is correct - returning okey");
                 return true;
             } else {
+                log.info(credential.username() + " User already exists but password is wrong");
                 return false;
             }
         } else {