Merge branch 'dev' into NCP-3

src/main/java/ru/soune/no_copy/controller/AuthController.java

@@ -3,10 +3,7 @@ package ru.soune.no_copy.controller;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import ru.soune.no_copy.dto.AuthResponse;
 import ru.soune.no_copy.dto.LoginRequest;
 import ru.soune.no_copy.dto.LoginResponse;
@@ -14,6 +11,8 @@ import ru.soune.no_copy.dto.RegisterRequest;
 import ru.soune.no_copy.entity.AuthToken;
 import ru.soune.no_copy.service.AuthService;
 
+import java.util.Map;
+
 @RestController
 @RequestMapping("/api/auth")
 @RequiredArgsConstructor
@@ -36,4 +35,13 @@ public class AuthController {
         return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(),
                 login.getToken(),login.getExpiresAt().toString()));
     }
+
+    @PostMapping("/logout")
+    public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
+        String token = tokenHeader.replace("Bearer ", "");
+
+        authService.logout(token);
+
+        return ResponseEntity.ok(Map.of("success", true));
+    }
 }

src/main/java/ru/soune/no_copy/controller/UserController.java

@@ -0,0 +1,28 @@
+package ru.soune.no_copy.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.soune.no_copy.dto.UserDTO;
+import ru.soune.no_copy.repository.UserRepository;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/user")
+@RequiredArgsConstructor
+public class UserController {
+
+    private final UserRepository userRepository;
+
+    @GetMapping("/all")
+    public ResponseEntity<List<UserDTO>> getAllUsers() {
+        List<UserDTO> allUsers = userRepository.findAll().stream()
+                .map(u -> new UserDTO(u.getFirstName(), u.getEmail(), u.getIsActive()))
+                .toList();
+
+        return ResponseEntity.ok(allUsers);
+    }
+}

src/main/java/ru/soune/no_copy/dto/UserDTO.java

@@ -0,0 +1,12 @@
+package ru.soune.no_copy.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UserDTO {
+    private String fullName;
+    private String email;
+    private boolean isActive;
+}

src/main/java/ru/soune/no_copy/entity/User.java

@@ -53,6 +53,6 @@ public class User {
     private LocalDateTime createdAt;
 
     @Column(name = "is_active")
-    private Boolean isActive;
+    private Boolean isActive = true;
 
 }

src/main/java/ru/soune/no_copy/repository/AuthTokenRepository.java

@@ -10,4 +10,5 @@ import java.util.Optional;
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
     Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
+    Optional<AuthToken> findByToken(String token);
 }

src/main/java/ru/soune/no_copy/service/AuthService.java

@@ -78,6 +78,10 @@ public class AuthService {
         return authTokenRepository.save(authToken);
     }
 
+    public void logout(String token) {
+        authTokenRepository.findByToken(token)
+                .ifPresent(authTokenRepository::delete);
+    }
 
     private String generateAuthToken() {
         byte[] bytes = new byte[32];