Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java (revision b70fbeb1a16c9d900c276242b590510a38a98b4a) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -1,8 +1,7 @@ package com.ukim.finki.develop.finkwave.controller; +import java.io.IOException; import java.util.Map; -import com.ukim.finki.develop.finkwave.config.AuthProperties; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -10,7 +9,15 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +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 com.ukim.finki.develop.finkwave.config.AuthProperties; +import com.ukim.finki.develop.finkwave.exceptions.InvalidTokenException; +import com.ukim.finki.develop.finkwave.exceptions.UnauthenticatedException; import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto; import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto; @@ -31,16 +38,10 @@ public ResponseEntity> register( @ModelAttribute AuthRequestDto authRequestDto, - HttpServletResponse httpServletResponse){ - try { - UserResponseDto userResponseDto = authService.registerAndLogIn(httpServletResponse, authRequestDto); - return ResponseEntity.ok(Map.of( - "user", userResponseDto, - "tokenExpiresIn", authProperties.getAccessTokenMaxAge() - )); - } catch (Exception e){ - return ResponseEntity - .status(HttpStatus.BAD_REQUEST) - .body(Map.of("error", e.getMessage())); - } + HttpServletResponse httpServletResponse) throws IOException { + UserResponseDto userResponseDto = authService.registerAndLogIn(httpServletResponse, authRequestDto); + return ResponseEntity.ok(Map.of( + "user", userResponseDto, + "tokenExpiresIn", authProperties.getAccessTokenMaxAge() + )); } @@ -48,26 +49,18 @@ public ResponseEntity> login( @RequestBody LoginRequestDto loginRequestDto, - HttpServletResponse httpServletResponse){ - try { - UserResponseDto userResponseDto = authService.login(httpServletResponse, loginRequestDto); - return ResponseEntity.ok(Map.of( - "user", userResponseDto, - "tokenExpiresIn", authProperties.getAccessTokenMaxAge() - ) - ); - } catch (Exception e){ - return ResponseEntity - .status(HttpStatus.BAD_REQUEST) - .body(Map.of("error", e.getMessage())); - } + HttpServletResponse httpServletResponse) { + UserResponseDto userResponseDto = authService.login(httpServletResponse, loginRequestDto); + return ResponseEntity.ok(Map.of( + "user", userResponseDto, + "tokenExpiresIn", authProperties.getAccessTokenMaxAge() + )); } - @PostMapping("/refresh") public ResponseEntity> refresh( HttpServletResponse httpServletResponse, - @CookieValue(name = "refreshToken", required = false) String refreshToken){ - if (refreshToken == null){ - throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "No credentials"); + @CookieValue(name = "refreshToken", required = false) String refreshToken) { + if (refreshToken == null) { + throw new InvalidTokenException("No refresh token provided."); } authService.refreshAccessTokenAndAddCookie(httpServletResponse, refreshToken); @@ -80,5 +73,5 @@ public ResponseEntity> logout( HttpServletResponse httpServletResponse, - @CookieValue(name = "refreshToken", required = false) String refreshToken){ + @CookieValue(name = "refreshToken", required = false) String refreshToken) { authService.clearCookies(httpServletResponse, refreshToken); SecurityContextHolder.clearContext(); @@ -87,8 +80,8 @@ @GetMapping("/user") - public ResponseEntity> getUser(){ + public ResponseEntity> getUser() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication == null || !authentication.isAuthenticated()){ - throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Not authenticated"); + if (authentication == null || !authentication.isAuthenticated()) { + throw new UnauthenticatedException(); } Object principal = authentication.getPrincipal(); Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/GlobalExceptionHandler.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/GlobalExceptionHandler.java (revision b70fbeb1a16c9d900c276242b590510a38a98b4a) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/GlobalExceptionHandler.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -1,21 +1,61 @@ package com.ukim.finki.develop.finkwave.controller; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.multipart.MaxUploadSizeExceededException; +import org.springframework.web.server.ResponseStatusException; -import java.util.HashMap; -import java.util.Map; +import com.ukim.finki.develop.finkwave.exceptions.AuthException; @RestControllerAdvice public class GlobalExceptionHandler { + private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class); - @ExceptionHandler(RuntimeException.class) - public ResponseEntity> handleRuntimeException(RuntimeException ex) { - Map errorMap = new HashMap<>(); - errorMap.put("error", ex.getMessage()); + @ExceptionHandler(AuthException.class) + public ResponseEntity> handleAuthException(AuthException ex) { + return ResponseEntity + .status(ex.getStatus()) + .body(Map.of("error", ex.getMessage())); + } - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorMap); + @ExceptionHandler(UsernameNotFoundException.class) + public ResponseEntity> handleUsernameNotFound(UsernameNotFoundException ex) { + return ResponseEntity + .status(HttpStatus.UNAUTHORIZED) + .body(Map.of("error", "Invalid credentials.")); + } + + @ExceptionHandler(ResponseStatusException.class) + public ResponseEntity> handleResponseStatusException(ResponseStatusException ex) { + logger.error("Response status:", ex); + return ResponseEntity + .status(ex.getStatusCode()) + .body(Map.of("error", ex.getReason() != null ? ex.getReason() : "An error occurred.")); + } + + @ExceptionHandler(MaxUploadSizeExceededException.class) + public ResponseEntity> handleMaxSize(MaxUploadSizeExceededException ex) { + logger.error("Max upload size error:", ex); + return ResponseEntity + .status(HttpStatus.PAYLOAD_TOO_LARGE) + .body(Map.of( + "error", "File too large.", + "maxSize", "2MB" + )); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity> handleGenericException(Exception ex) { + logger.error("Unexpected error occurred:", ex); + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(Map.of("error", "An unexpected error occurred.")); } } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/AuthException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/AuthException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/AuthException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,16 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public abstract class AuthException extends RuntimeException { + + public AuthException(String message) { + super(message); + } + + public AuthException(String message, Throwable cause) { + super(message, cause); + } + + public abstract HttpStatus getStatus(); +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidCredentialsException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidCredentialsException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidCredentialsException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,19 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public class InvalidCredentialsException extends AuthException { + + public InvalidCredentialsException() { + super("Invalid credentials."); + } + + public InvalidCredentialsException(String message) { + super(message); + } + + @Override + public HttpStatus getStatus() { + return HttpStatus.UNAUTHORIZED; + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidFileException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidFileException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidFileException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,24 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public class InvalidFileException extends AuthException { + + public InvalidFileException(String message) { + super(message); + } + + public static InvalidFileException invalidType() { + return new InvalidFileException("Invalid file type. Only images are allowed."); + } + + public static InvalidFileException tooLarge(long maxSizeBytes) { + long maxSizeMB = maxSizeBytes / 1_000_000; + return new InvalidFileException("File too large. Maximum size is " + maxSizeMB + "MB."); + } + + @Override + public HttpStatus getStatus() { + return HttpStatus.BAD_REQUEST; + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidTokenException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidTokenException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/InvalidTokenException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,19 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public class InvalidTokenException extends AuthException { + + public InvalidTokenException() { + super("Invalid or expired token."); + } + + public InvalidTokenException(String message) { + super(message); + } + + @Override + public HttpStatus getStatus() { + return HttpStatus.UNAUTHORIZED; + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UnauthenticatedException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UnauthenticatedException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UnauthenticatedException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,19 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public class UnauthenticatedException extends AuthException { + + public UnauthenticatedException() { + super("User not authenticated."); + } + + public UnauthenticatedException(String message) { + super(message); + } + + @Override + public HttpStatus getStatus() { + return HttpStatus.UNAUTHORIZED; + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UserAlreadyExistsException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UserAlreadyExistsException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UserAlreadyExistsException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,18 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public class UserAlreadyExistsException extends AuthException { + + public UserAlreadyExistsException(String username) { + super("Username '" + username + "' is already taken."); + } + public UserAlreadyExistsException() { + super("Username is already taken."); + } + + @Override + public HttpStatus getStatus() { + return HttpStatus.CONFLICT; + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UserNotFoundException.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UserNotFoundException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/exceptions/UserNotFoundException.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -0,0 +1,19 @@ +package com.ukim.finki.develop.finkwave.exceptions; + +import org.springframework.http.HttpStatus; + +public class UserNotFoundException extends AuthException { + + public UserNotFoundException() { + super("User not found."); + } + + public UserNotFoundException(String message) { + super(message); + } + + @Override + public HttpStatus getStatus() { + return HttpStatus.NOT_FOUND; + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java (revision b70fbeb1a16c9d900c276242b590510a38a98b4a) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -1,3 +1,9 @@ package com.ukim.finki.develop.finkwave.service; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.UUID; import org.springframework.security.core.Authentication; @@ -5,13 +11,19 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import com.ukim.finki.develop.finkwave.config.AuthProperties; -import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto; -import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto; -import com.ukim.finki.develop.finkwave.model.dto.UserResponseDto; +import com.ukim.finki.develop.finkwave.exceptions.InvalidCredentialsException; +import com.ukim.finki.develop.finkwave.exceptions.InvalidFileException; +import com.ukim.finki.develop.finkwave.exceptions.UnauthenticatedException; +import com.ukim.finki.develop.finkwave.exceptions.UserAlreadyExistsException; +import com.ukim.finki.develop.finkwave.exceptions.UserNotFoundException; import com.ukim.finki.develop.finkwave.model.NonAdminUser; import com.ukim.finki.develop.finkwave.model.RefreshToken; import com.ukim.finki.develop.finkwave.model.Role; import com.ukim.finki.develop.finkwave.model.User; +import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto; +import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto; +import com.ukim.finki.develop.finkwave.model.dto.UserResponseDto; import com.ukim.finki.develop.finkwave.repository.NonAdminUserRepository; import com.ukim.finki.develop.finkwave.repository.UserRepository; @@ -21,11 +33,4 @@ import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.UUID; @Service @@ -39,4 +44,5 @@ private final AuthProperties authProperties; + private static final long MAX_FILE_SIZE = 2_000_000; @Transactional @@ -44,5 +50,5 @@ throws IOException { if (userRepository.findByUsername(authRequestDto.username()).isPresent()){ - throw new RuntimeException("Error creating user."); + throw new UserAlreadyExistsException(); } User user = createNonAdminUser(authRequestDto); @@ -52,8 +58,8 @@ public UserResponseDto login(HttpServletResponse response, LoginRequestDto loginRequestDto){ User user = userRepository.findByUsername(loginRequestDto.username()) - .orElseThrow(() -> new RuntimeException("Invalid credentials.")); + .orElseThrow(InvalidCredentialsException::new); if (!passwordEncoder.matches(loginRequestDto.password(), user.getPassword())){ - throw new RuntimeException("Invalid credentials."); + throw new InvalidCredentialsException(); } @@ -74,5 +80,5 @@ public UserResponseDto getUserDtoByUsername(String username){ User user = userRepository.findByUsername(username) - .orElseThrow(() -> new RuntimeException("Invalid credentials.")); + .orElseThrow(UserNotFoundException::new); return userResponseFromUser(user); @@ -103,12 +109,11 @@ Authentication authentication= SecurityContextHolder.getContext().getAuthentication(); if (authentication == null || !authentication.isAuthenticated()) { - throw new RuntimeException("User not authenticated."); + throw new UnauthenticatedException(); } String username=authentication.getName(); - return userRepository.findByUsername(username).map(User::getId) - .orElseThrow(()->new RuntimeException("User not found.")); + .orElseThrow(UserNotFoundException::new); } @@ -124,10 +129,12 @@ MultipartFile profilePhoto = authRequestDto.profilePhoto(); - if (profilePhoto != null) { - if (profilePhoto.getContentType() != null && !profilePhoto.getContentType().startsWith("image/")) - throw new IllegalArgumentException("Invalid fyle type."); + if (profilePhoto != null && !profilePhoto.isEmpty()) { + String contentType = profilePhoto.getContentType(); + if (contentType == null || !contentType.startsWith("image/")) { + throw InvalidFileException.invalidType(); + } - if (profilePhoto.getSize() > 2_000_000) { - throw new IllegalArgumentException(("File too large.")); + if (profilePhoto.getSize() > MAX_FILE_SIZE) { + throw InvalidFileException.tooLarge(MAX_FILE_SIZE); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/RefreshTokenService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/RefreshTokenService.java (revision b70fbeb1a16c9d900c276242b590510a38a98b4a) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/RefreshTokenService.java (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -1,10 +1,3 @@ package com.ukim.finki.develop.finkwave.service; - -import com.ukim.finki.develop.finkwave.config.AuthProperties; -import com.ukim.finki.develop.finkwave.model.RefreshToken; -import com.ukim.finki.develop.finkwave.model.User; -import com.ukim.finki.develop.finkwave.repository.RefreshTokenRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; import java.time.Instant; @@ -12,4 +5,14 @@ import java.util.Optional; import java.util.UUID; + +import org.springframework.stereotype.Service; + +import com.ukim.finki.develop.finkwave.config.AuthProperties; +import com.ukim.finki.develop.finkwave.exceptions.InvalidTokenException; +import com.ukim.finki.develop.finkwave.model.RefreshToken; +import com.ukim.finki.develop.finkwave.model.User; +import com.ukim.finki.develop.finkwave.repository.RefreshTokenRepository; + +import lombok.RequiredArgsConstructor; @Service @@ -32,7 +35,11 @@ public RefreshToken validateRefreshToken(String token){ - RefreshToken refreshToken = findByToken(token).orElseThrow(() -> new RuntimeException("Invalid token")); - if (refreshToken.isRevoked() || refreshToken.getExpiresAt().isBefore(Instant.now())){ - throw new RuntimeException("Invalid refresh token"); + RefreshToken refreshToken = findByToken(token) + .orElseThrow(() -> new InvalidTokenException("Invalid refresh token.")); + if (refreshToken.isRevoked()){ + throw new InvalidTokenException("Refresh token has been revoked."); + } + if (refreshToken.getExpiresAt().isBefore(Instant.now())){ + throw new InvalidTokenException("Refresh token has expired."); } return refreshToken; Index: frontend/src/pages/Login.tsx =================================================================== --- frontend/src/pages/Login.tsx (revision b70fbeb1a16c9d900c276242b590510a38a98b4a) +++ frontend/src/pages/Login.tsx (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -28,6 +28,5 @@ error.response?.data?.error || "Login failed. Please check your credentials."; - setError(errorMessage); - toast.error(errorMessage); + setError(`Login failed: ${errorMessage}`); } }; Index: frontend/src/pages/Register.tsx =================================================================== --- frontend/src/pages/Register.tsx (revision b70fbeb1a16c9d900c276242b590510a38a98b4a) +++ frontend/src/pages/Register.tsx (revision 3238007b9dbc5f9b1be113a3d57611699c0c7302) @@ -58,6 +58,5 @@ const errorMessage = error.response?.data?.error || "Registration failed. Please try again."; - setError(errorMessage); - toast.error(errorMessage); + setError(`Registration failed: ${errorMessage}`); } };