Merge branch 'refactor-auth'

src/main/java/_11/asktpk/artisanconnectbackend/controller/AuthController.java

@@ -1,70 +1,68 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
+import _11.asktpk.artisanconnectbackend.customExceptions.ClientAlreadyExistsException;
+import _11.asktpk.artisanconnectbackend.customExceptions.WrongLoginPasswordException;
 import _11.asktpk.artisanconnectbackend.dto.*;
-import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.service.AuthService;
-import _11.asktpk.artisanconnectbackend.security.JwtUtil;
-import _11.asktpk.artisanconnectbackend.service.ClientService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Map;
 
 @Slf4j
 @RestController
 @RequestMapping("/api/v1/auth")
 public class AuthController {
 
-    private final ClientService clientService;
+    private final AuthService authService;
-    private final JwtUtil jwtUtil;
 
-    public AuthController(ClientService clientService, JwtUtil jwtUtil) {
+    public AuthController(AuthService authService) {
-        this.clientService = clientService;
+        this.authService = authService;
-        this.jwtUtil = jwtUtil;
     }
 
     @PostMapping("/login")
-    public ResponseEntity<AuthResponseDTO> login(@RequestBody AuthRequestDTO authRequestDTO) {
+    public ResponseEntity<?> login(@RequestBody AuthRequestDTO authRequestDTO) {
-        if (clientService.checkClientCredentials(authRequestDTO)) {
+        if (authRequestDTO.getEmail() == null || authRequestDTO.getPassword() == null
-            Client client = clientService.getClientByEmail(authRequestDTO.getEmail());
+                || authRequestDTO.getEmail().isEmpty() || authRequestDTO.getPassword().isEmpty()) {
-            Long userId = client.getId();
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Przekazano puste login lub hasło"));
-            String userRole = client.getRole().getRole();
+        }
 
-            String token = jwtUtil.generateToken(client.getEmail(), userRole, userId);
+        authRequestDTO.setEmail(authRequestDTO.getEmail().toLowerCase());
+
+        try {
+            AuthResponseDTO responseDTO = authService.login(authRequestDTO.getEmail(), authRequestDTO.getPassword());
 
-            log.info("User logged in with {}", client.getEmail());
             return ResponseEntity.status(HttpStatus.OK)
-                    .body(new AuthResponseDTO(userId, userRole, token));
+                    .body(responseDTO);
-        } else {
+
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null);
+        } catch (WrongLoginPasswordException e) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new RequestResponseDTO(e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO(e.getMessage()));
         }
     }
 
     @PostMapping("/register")
-    public ResponseEntity<AuthResponseDTO> register(@RequestBody ClientRegistrationDTO clientDTO) {
+    public ResponseEntity<?> register(@RequestBody ClientRegistrationDTO clientRegistrationDTO) {
-        if (clientService.getClientByEmail(clientDTO.getEmail()) != null) {
+        if (clientRegistrationDTO.getEmail() == null || clientRegistrationDTO.getPassword() == null
-            return ResponseEntity.status(HttpStatus.CONFLICT).build();
+                || clientRegistrationDTO.getEmail().isEmpty() || clientRegistrationDTO.getPassword().isEmpty()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Przekazano puste login lub hasło"));
         }
 
-        ClientDTO savedClient = clientService.registerClient(clientDTO);
+        clientRegistrationDTO.setEmail(clientRegistrationDTO.getEmail().toLowerCase());
 
-        String token = jwtUtil.generateToken(
+        try {
-                savedClient.getEmail(),
+            AuthResponseDTO registrationData = authService.register(clientRegistrationDTO.getEmail(), clientRegistrationDTO.getPassword(), clientRegistrationDTO.getFirstName(), clientRegistrationDTO.getLastName());
-                savedClient.getRole(),
-                savedClient.getId()
-        );
 
-        log.info("New user registered with {}", savedClient.getEmail());
+            return ResponseEntity.status(HttpStatus.CREATED)
-
+                    .body(registrationData);
-        return ResponseEntity.status(HttpStatus.CREATED)
+        } catch (ClientAlreadyExistsException clientAlreadyExistsException) {
-                .body(new AuthResponseDTO(
+            return ResponseEntity.status(HttpStatus.CONFLICT)
-                        savedClient.getId(),
+                    .body(new RequestResponseDTO(clientAlreadyExistsException.getMessage()));
-                        savedClient.getRole(),
+        } catch (Exception e) {
-                        token
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO(e.getMessage()));
-                ));
+        }
     }
 
     @PostMapping("/logout")
@@ -73,7 +71,7 @@ public class AuthController {
 
         if (authHeader != null && authHeader.startsWith("Bearer ")) {
             String token = authHeader.substring(7);
-            jwtUtil.blacklistToken(token);
+            authService.logout(token);
             return ResponseEntity.ok(new RequestResponseDTO("Successfully logged out"));
         }
 
@@ -82,43 +80,16 @@ public class AuthController {
 
     @PostMapping("/google")
     public ResponseEntity<?> authenticateWithGoogle(@RequestBody GoogleAuthRequestDTO dto) {
+        if(dto.getGoogleToken() == null){
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Invalid or empty token"));
+        }
+
         try {
-            String accessToken = dto.getGoogleToken();
+            AuthResponseDTO response = authService.googleLogin(dto.getGoogleToken());
-            String googleUserInfoUrl = "https://www.googleapis.com/oauth2/v3/userinfo";
+            return ResponseEntity.status(HttpStatus.OK).body(response);
-
-            HttpHeaders headers = new HttpHeaders();
-            headers.setBearerAuth(accessToken);
-            HttpEntity<String> entity = new HttpEntity<>(headers);
-
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<Map> response = restTemplate.exchange(
-                    googleUserInfoUrl, HttpMethod.GET, entity, Map.class);
-
-            Map<String, Object> userInfo = response.getBody();
-
-//                String googleId = (String) userInfo.get("sub");  Potencjalnie możemy używać googlowskiego ID, ale to ma konflikt z naszym generowanym
-            assert userInfo != null;
-            String email = (String) userInfo.get("email");
-            String name = (String) userInfo.get("name");
-
-            Client client = clientService.getClientByEmail(email);
-            if (client == null) {
-                client = new Client();
-                client.setEmail(email);
-                client.setFirstName(name);
-                client.setRole(clientService.getUserRole()); // to pobiera po prostu role "USER" z tabeli w bazie
-                clientService.saveClientToDB(client);
-            }
-
-            String jwt = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
-
-            log.info("User authenticated with google: {}", email);
-            return ResponseEntity.ok(new AuthResponseDTO(client.getId(), client.getRole().getRole(), jwt));
         } catch (HttpClientErrorException httpClientErrorException) {
-            log.error("Token is invalid or expired");
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Google access token is invalid or expired"));
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new RequestResponseDTO("Invalid access token"));
         } catch (Exception e) {
-            log.error("Error while checking Google access token", e);
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
                     .body(new RequestResponseDTO("Authentication Error (Google): " + e.getMessage()));
         }

src/main/java/_11/asktpk/artisanconnectbackend/customExceptions/ClientAlreadyExistsException.java

@@ -0,0 +1,7 @@
+package _11.asktpk.artisanconnectbackend.customExceptions;
+
+public class ClientAlreadyExistsException extends Exception {
+    public ClientAlreadyExistsException(String message) {
+        super(message);
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/customExceptions/WrongLoginPasswordException.java

@@ -0,0 +1,7 @@
+package _11.asktpk.artisanconnectbackend.customExceptions;
+
+public class WrongLoginPasswordException extends Exception {
+    public WrongLoginPasswordException(String message) {
+        super(message);
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/ClientDTO.java

@@ -1,12 +1,16 @@
 package _11.asktpk.artisanconnectbackend.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import jakarta.validation.constraints.Email;
 
 @Getter @Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class ClientDTO {
     private Long id;
 

src/main/java/_11/asktpk/artisanconnectbackend/entities/Client.java

@@ -2,6 +2,7 @@ package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 
@@ -11,7 +12,15 @@ import java.util.List;
 @Entity
 @Table(name = "clients")
 @Getter @Setter
+@NoArgsConstructor
 public class Client {
+    public Client(String email, String password, String firstName, String lastName) {
+        this.email = email;
+        this.password = password;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

src/main/java/_11/asktpk/artisanconnectbackend/service/AuthService.java

@@ -0,0 +1,117 @@
+package _11.asktpk.artisanconnectbackend.service;
+
+import _11.asktpk.artisanconnectbackend.customExceptions.ClientAlreadyExistsException;
+import _11.asktpk.artisanconnectbackend.customExceptions.WrongLoginPasswordException;
+import _11.asktpk.artisanconnectbackend.dto.AuthResponseDTO;
+import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.security.JwtUtil;
+import org.springframework.http.*;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+@Slf4j
+@Service
+public class AuthService {
+
+    private final ClientService clientService;
+    private final PasswordEncoder passwordEncoder;
+    private final JwtUtil jwtUtil;
+
+    public AuthService(ClientService clientService, JwtUtil jwtUtil) {
+        this.clientService = clientService;
+        this.jwtUtil = jwtUtil;
+        this.passwordEncoder = new BCryptPasswordEncoder();
+    }
+
+    public AuthResponseDTO login(String email, String password) throws Exception {
+        Client client = clientService.getClientByEmail(email);
+        if (client == null) {
+            throw new Exception("Klient o podanym adresie nie istnieje!");
+        }
+
+        if (passwordEncoder.matches(password, client.getPassword())) {
+            String token = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
+            log.info("User logged in with {}", client.getEmail());
+            return new AuthResponseDTO(client.getId(), client.getRole().getRole(), token);
+        }
+        throw new WrongLoginPasswordException("Login lub hasło jest niepoprawny!");
+    }
+
+    public AuthResponseDTO register(String email, String password, String firstName, String lastName) throws Exception {
+        if (clientService.getClientByEmail(email) != null) {
+            throw new ClientAlreadyExistsException("Klient o podanym adresie email już istnieje!");
+        }
+
+        Client newClient = new Client();
+        newClient.setEmail(email);
+        newClient.setPassword(passwordEncoder.encode(password));
+        newClient.setFirstName(firstName);
+        newClient.setLastName(lastName);
+
+        ClientDTO savedClient = clientService.registerClient(newClient);
+        if (savedClient != null) {
+            log.info("New user registered with {}", savedClient.getEmail());
+            String token = jwtUtil.generateToken(
+                    savedClient.getEmail(),
+                    savedClient.getRole(),
+                    savedClient.getId()
+            );
+
+            return new AuthResponseDTO(savedClient.getId(), savedClient.getRole(), token);
+        } else {
+            throw new Exception("Rejestracja nie powiodła się!");
+        }
+    }
+
+    public void logout(String token) {
+        jwtUtil.blacklistToken(token);
+    }
+
+    public AuthResponseDTO googleLogin(String googleAccessToken) throws Exception {
+        String googleUserInfoUrl = "https://www.googleapis.com/oauth2/v3/userinfo";
+
+        ResponseEntity<Map> response;
+
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setBearerAuth(googleAccessToken);
+        RestTemplate restTemplate = new RestTemplate();
+        response = restTemplate.exchange(
+                googleUserInfoUrl, HttpMethod.GET, new HttpEntity<>(headers), Map.class);
+
+
+        Map<String, Object> userInfo = response.getBody();
+
+//                String googleId = (String) userInfo.get("sub");  Potencjalnie możemy używać googlowskiego ID, ale to ma konflikt z naszym generowanym
+        if (userInfo == null) {
+            throw new Exception("Pobrany użytkownik jest pusty! Może to być spowodowane niepoprawnym tokenem lub brakiem dostępu do Google API.");
+        }
+        String email = (String) userInfo.get("email");
+        String name = (String) userInfo.get("name");
+
+        Client client = clientService.getClientByEmail(email);
+        if (client == null) {
+            client = new Client();
+            client.setEmail(email);
+            client.setFirstName(name);
+            client.setRole(clientService.getUserRole()); // to pobiera po prostu role "USER" z tabeli w bazie
+            clientService.saveClientToDB(client);
+        }
+
+        String jwt = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
+        log.info("User authenticated with google: {}", client.getEmail());
+        return new AuthResponseDTO(
+                client.getId(),
+                client.getRole().getRole(),
+                jwt
+        );
+    }
+
+}
+

src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java

@@ -1,6 +1,5 @@
 package _11.asktpk.artisanconnectbackend.service;
 
-import _11.asktpk.artisanconnectbackend.dto.AuthRequestDTO;
 import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
 import _11.asktpk.artisanconnectbackend.dto.ClientRegistrationDTO;
 import _11.asktpk.artisanconnectbackend.entities.Client;
@@ -25,7 +24,7 @@ public class ClientService {
         this.rolesRepository = rolesRepository;
     }
 
-    private ClientDTO toDto(Client client) {
+    public ClientDTO toDto(Client client) {
         if(client == null) {
             return null;
         }
@@ -42,7 +41,7 @@ public class ClientService {
         return dto;
     }
 
-    private Client fromDto(ClientDTO dto) {
+    public Client fromDto(ClientDTO dto) {
         Client client = new Client();
         Role rola;
 
@@ -86,6 +85,14 @@ public class ClientService {
         return toDto(clientRepository.findById(id).orElse(null));
     }
 
+    public Client getClientByEmail(String email) {
+        return clientRepository.findByEmail(email);
+    }
+
+    public Role getUserRole() {
+        return rolesRepository.findRoleByRole("USER");
+    }
+
     public boolean clientExists(Long id) {
         return clientRepository.existsById(id);
     }
@@ -117,29 +124,9 @@ public class ClientService {
         clientRepository.deleteById(id);
     }
 
-    // И замените метод checkClientCredentials на:
+    public ClientDTO registerClient(Client client) {
-    public boolean checkClientCredentials(AuthRequestDTO dto) {
+        client.setRole(getUserRole()); // ID 1 - USER role
-        Client cl = clientRepository.findByEmail(dto.getEmail());
-        if (cl == null) {
-            return false;
-        }
-
-        return passwordEncoder.matches(dto.getPassword(), cl.getPassword());
-    }
-
-    // При создании нового пользователя не забудьте шифровать пароль:
-    public ClientDTO registerClient(ClientRegistrationDTO clientDTO) {
-        Client client = fromDto(clientDTO);
-        client.setRole(rolesRepository.findRoleById(1L));
         client.setPassword(passwordEncoder.encode(client.getPassword()));
         return toDto(clientRepository.save(client));
     }
-
-    public Client getClientByEmail(String email) {
-        return clientRepository.findByEmail(email);
-    }
-
-    public Role getUserRole() {
-        return rolesRepository.findRoleByRole("USER");
-    }
 }