diff --git a/src/main/java/com/safetypin/authentication/service/AuthenticationService.java b/src/main/java/com/safetypin/authentication/service/AuthenticationService.java
index 7fa04bb40d682affd75ad7744ec64ccddaeb20bc..e351df0cd36866c84b848d21e2238b50b0b327e2 100644
--- a/src/main/java/com/safetypin/authentication/service/AuthenticationService.java
+++ b/src/main/java/com/safetypin/authentication/service/AuthenticationService.java
@@ -1,48 +1,34 @@
package com.safetypin.authentication.service;
import com.safetypin.authentication.dto.RegistrationRequest;
-import com.safetypin.authentication.dto.SocialLoginRequest;
-import com.safetypin.authentication.dto.UserResponse;
import com.safetypin.authentication.exception.InvalidCredentialsException;
import com.safetypin.authentication.exception.UserAlreadyExistsException;
import com.safetypin.authentication.model.User;
-import com.safetypin.authentication.repository.UserRepository;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.security.Keys;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
-import java.security.Key;
import java.time.LocalDate;
import java.time.Period;
-import java.util.Date;
import java.util.Optional;
-import java.util.UUID;
@Service
public class AuthenticationService {
public static final String EMAIL_PROVIDER = "EMAIL";
-
- private final UserRepository userRepository;
+ private final UserService userService;
private final PasswordEncoder passwordEncoder;
private final OTPService otpService;
- private static final Logger logger = LoggerFactory.getLogger(AuthenticationService.class);
- private final String JWT_SECRET_KEY = "5047c55bfe120155fd4e884845682bb8b8815c0048a686cc664d1ea6c8e094da";
+ private final JwtService jwtService;
+ private static final Logger logger = LoggerFactory.getLogger(AuthenticationService.class);
- public AuthenticationService(UserRepository userRepository, PasswordEncoder passwordEncoder, OTPService otpService) {
- this.userRepository = userRepository;
+ public AuthenticationService(UserService userService, PasswordEncoder passwordEncoder, OTPService otpService, JwtService jwtService) {
+ this.userService = userService;
this.passwordEncoder = passwordEncoder;
this.otpService = otpService;
- }
-
- protected UserRepository getUserRepository() {
- return userRepository;
+ this.jwtService = jwtService;
}
// Registration using email – includes birthdate and OTP generation
@@ -50,8 +36,8 @@ public class AuthenticationService {
if (calculateAge(request.getBirthdate()) < 16) {
throw new IllegalArgumentException("User must be at least 16 years old");
}
- User existingUser = userRepository.findByEmail(request.getEmail());
- if (existingUser != null) {
+ Optional<User> existingUser = userService.findByEmail(request.getEmail());
+ if (existingUser.isPresent()) {
throw new UserAlreadyExistsException("Email address is already registered. If you previously used social login (Google/Apple), please use that method to sign in.");
}
String encodedPassword = passwordEncoder.encode(request.getPassword());
@@ -65,82 +51,41 @@ public class AuthenticationService {
user.setRole("USER");
user.setBirthdate(request.getBirthdate());
user.setProvider(EMAIL_PROVIDER);
- user = userRepository.save(user);
+ user = userService.save(user);
otpService.generateOTP(request.getEmail());
logger.info("OTP generated for user at {}", java.time.LocalDateTime.now());
- return generateJwtToken(user.getId());
- }
-
- // Social registration/login – simulating data fetched from Google/Apple
- public String socialLogin(SocialLoginRequest request) {
- if (calculateAge(request.getBirthdate()) < 16) {
- throw new IllegalArgumentException("User must be at least 16 years old");
- }
- User existing = userRepository.findByEmail(request.getEmail());
-
- // login (if email is found)
- if (existing != null) {
- if (EMAIL_PROVIDER.equals(existing.getProvider())) {
- // already logged in using email instead of social
- throw new UserAlreadyExistsException("An account with this email exists. Please sign in using your email and password.");
- }
- generateJwtToken(existing.getId());
- }
-
- // register
- User user = new User();
- user.setEmail(request.getEmail());
- user.setPassword(null);
- user.setName(request.getName());
- user.setVerified(true);
- user.setRole("USER");
- user.setBirthdate(request.getBirthdate());
- user.setProvider(request.getProvider().toUpperCase());
-
- user = userRepository.save(user);
- logger.info("User registered via social login at {}", java.time.LocalDateTime.now());
-
- return generateJwtToken(user.getId());
+ return jwtService.generateToken(user.getId());
}
// Email login with detailed error messages
public String loginUser(String email, String rawPassword) {
- User user = userRepository.findByEmail(email);
- if (user == null) {
+ Optional<User> findUser = userService.findByEmail(email);
+ if (findUser.isEmpty()) {
// email not exists
logger.warn("Login failed: Email not found");
throw new InvalidCredentialsException("Invalid email");
}
+ User user = findUser.get();
if (!passwordEncoder.matches(rawPassword, user.getPassword())) {
// incorrect password
logger.warn("Login failed: Incorrect password attempt");
throw new InvalidCredentialsException("Invalid password");
}
logger.info("User logged in at {}", java.time.LocalDateTime.now());
- return generateJwtToken(user.getId());
- }
-
- // Social login verification (assumed to be pre-verified externally)
- public String loginSocial(String email) {
- User user = userRepository.findByEmail(email);
- if (user == null) {
- throw new InvalidCredentialsException("Social login failed: Email not found");
- }
- logger.info("User logged in via social authentication at {}", java.time.LocalDateTime.now());
-
- return generateJwtToken(user.getId());
+ return jwtService.generateToken(user.getId());
}
// OTP verification – marks user as verified upon success
public boolean verifyOTP(String email, String otp) {
boolean result = otpService.verifyOTP(email, otp);
if (result) {
- User user = userRepository.findByEmail(email);
- if (user != null) {
+ Optional<User> findUser = userService.findByEmail(email);
+ if (findUser.isPresent()) {
+ User user = findUser.get();
user.setVerified(true);
- userRepository.save(user);
+ userService.save(user);
logger.info("OTP successfully verified at {}", java.time.LocalDateTime.now());
}
} else {
@@ -151,68 +96,17 @@ public class AuthenticationService {
// Forgot password – only applicable for email-registered users
public void forgotPassword(String email) {
- User user = userRepository.findByEmail(email);
- if (user == null || !EMAIL_PROVIDER.equals(user.getProvider())) {
+
+ Optional<User> user = userService.findByEmail(email);
+ if (user.isEmpty() || !EMAIL_PROVIDER.equals(user.get().getProvider())) {
throw new IllegalArgumentException("Password reset is only available for email-registered users.");
}
// In production, send a reset token via email.
logger.info("Password reset requested at {}", java.time.LocalDateTime.now());
}
- // Example method representing posting content that requires a verified account
- public String postContent(String email, String content) { // NOSONAR
- User user = userRepository.findByEmail(email);
- if (user == null) {
- return "User not found. Please register.";
- }
- if (!user.isVerified()) {
- return "Your account is not verified. Please complete OTP verification. You may request a new OTP after 2 minutes.";
- }
- logger.info("Content posted successfully by user");
- // For demo purposes, we assume the post is successful.
- return "Content posted successfully";
- }
-
private int calculateAge(LocalDate birthdate) {
return Period.between(birthdate, LocalDate.now()).getYears();
}
-
-
- public String generateJwtToken(UUID userId){
- Key key = Keys.hmacShaKeyFor(JWT_SECRET_KEY.getBytes());
- // 1 day
- long EXPIRATION_TIME = 86400000;
- return Jwts
- .builder()
- .setSubject(userId.toString())
- .setIssuedAt(new Date(System.currentTimeMillis()))
- .setExpiration(new Date(System.currentTimeMillis() + EXPIRATION_TIME))
- .signWith(key, SignatureAlgorithm.HS256)
- .compact();
- }
-
- public UserResponse getUserFromJwtToken(String token) {
- Key key = Keys.hmacShaKeyFor(JWT_SECRET_KEY.getBytes());
- Claims claims = Jwts.parserBuilder()
- .setSigningKey(key)
- .build()
- .parseClaimsJws(token)
- .getBody();
-
- boolean isExpired = claims.getExpiration().before(new Date(System.currentTimeMillis()));
- UUID userId = UUID.fromString(claims.getSubject());
-
- if (isExpired) {
- throw new InvalidCredentialsException("Token expired");
- } else {
- Optional<User> user = userRepository.findById(userId);
- if (user.isEmpty()) {
- throw new InvalidCredentialsException("User not found");
- }
- return user.get().generateUserResponse();
- }
- }
-
-
}