Merge pull request #29 from jamilhelal37/main

 الحق الدومين جميل قاعد يعدل عال main

Author: kassemyahia

src/main/java/com/jamil/ahadith/features/account/service/PasswordResetService.java

@@ -11,7 +11,6 @@
 import com.jamil.ahadith.features.account.entity.PasswordResetToken;
 import com.jamil.ahadith.features.account.event.AccountEmailEvent;
 import com.jamil.ahadith.features.account.repository.PasswordResetTokenRepository;
-import com.jamil.ahadith.features.audit.service.AuditEventPublisher;
 import com.jamil.ahadith.features.user.entity.User;
 import com.jamil.ahadith.features.user.entity.UserStatus;
 import com.jamil.ahadith.features.user.repository.UserRepository;
@@ -23,17 +22,15 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
-import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
 public class PasswordResetService {
 
-    private static final String USERS_TABLE_NAME = "users";
-    private static final String PASSWORD_RESET_AUDIT_EVENT = "password reset completed";
     private static final String ACCOUNT_NOT_ACTIVE_MESSAGE = "Account is not active";
     private static final String INVALID_PASSWORD_RESET_TOKEN_MESSAGE = "Invalid or expired password reset token";
-    private static final String FORGOT_PASSWORD_MESSAGE = "If the email is registered, password reset instructions have been sent";
+    private static final String FORGOT_PASSWORD_MESSAGE =
+            "If the email is registered, password reset instructions have been sent";
 
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
@@ -42,7 +39,6 @@ public class PasswordResetService {
     private final MailConfigProperties mailProperties;
     private final PasswordPolicyService passwordPolicyService;
     private final RefreshTokenRevoker refreshTokenRevoker;
-    private final AuditEventPublisher auditEventPublisher;
     private final RateLimitService rateLimitService;
     private final RateLimitKeyResolver rateLimitKeyResolver;
     private final OneTimeTokenValidator oneTimeTokenValidator;
@@ -75,7 +71,11 @@ public MessageResponseDto resetPassword(ResetPasswordRequestDto request) {
 
         PasswordResetToken resetToken = passwordResetTokenRepository
                 .findByTokenHashForUpdate(tokenHash)
-                .orElseThrow(() -> new BadCredentialsException(INVALID_PASSWORD_RESET_TOKEN_MESSAGE));
+                .orElseThrow(() ->
+                        new BadCredentialsException(
+                                INVALID_PASSWORD_RESET_TOKEN_MESSAGE
+                        )
+                );
 
         oneTimeTokenValidator.validate(
                 resetToken.getConsumedAt(),
@@ -87,55 +87,64 @@ public MessageResponseDto resetPassword(ResetPasswordRequestDto request) {
         User user = resetToken.getUser();
         requireActive(user);
 
-        String encodedPassword = passwordEncoder.encode(request.getNewPassword());
-        int previousTokenVersion = user.getTokenVersion();
-        
+        String encodedPassword =
+                passwordEncoder.encode(request.getNewPassword());
+
         user.setPassword(encodedPassword);
-        user.setTokenVersion(previousTokenVersion + 1);
+        user.setTokenVersion(user.getTokenVersion() + 1);
+
         resetToken.setConsumedAt(now);
 
         refreshTokenRevoker.revokeAllForUser(user);
-        createPasswordResetAuditLog(user, previousTokenVersion);
 
         passwordResetTokenRepository.consumeActiveForUser(user, now);
-        // passwordResetTokenRepository.save(resetToken); // Managed via dirty checking
-        // userRepository.save(user); // Managed via dirty checking
 
-        return new MessageResponseDto("Password has been reset");
+        return new MessageResponseDto(
+                "Password has been reset"
+        );
     }
 
-    private void createAndSendPasswordResetToken(User user, Instant now) {
+    private void createAndSendPasswordResetToken(
+            User user,
+            Instant now
+    ) {
         passwordResetTokenRepository.consumeActiveForUser(user, now);
 
-        String rawToken = tokenHashService.generateOpaqueToken();
-        PasswordResetToken resetToken = new PasswordResetToken();
+        String rawToken =
+                tokenHashService.generateOpaqueToken();
+
+        PasswordResetToken resetToken =
+                new PasswordResetToken();
+
         resetToken.setUser(user);
-        resetToken.setTokenHash(tokenHashService.sha256(rawToken));
-        resetToken.setExpiresAt(now.plus(mailProperties.getResetTokenTtl()));
+        resetToken.setTokenHash(
+                tokenHashService.sha256(rawToken)
+        );
+        resetToken.setExpiresAt(
+                now.plus(mailProperties.getResetTokenTtl())
+        );
 
         passwordResetTokenRepository.save(resetToken);
 
-        eventPublisher.publishEvent(new AccountEmailEvent(user, rawToken, AccountEmailEvent.EmailEventType.PASSWORD_RESET));
+        eventPublisher.publishEvent(
+                new AccountEmailEvent(
+                        user,
+                        rawToken,
+                        AccountEmailEvent.EmailEventType.PASSWORD_RESET
+                )
+        );
     }
 
     private void requireActive(User user) {
         if (!isActive(user)) {
-            throw new ForbiddenException(ACCOUNT_NOT_ACTIVE_MESSAGE);
+            throw new ForbiddenException(
+                    ACCOUNT_NOT_ACTIVE_MESSAGE
+            );
         }
     }
 
     private boolean isActive(User user) {
-        return user != null && user.getStatus() == UserStatus.active;
-    }
-
-    private void createPasswordResetAuditLog(User user, int previousTokenVersion) {
-        auditEventPublisher.publishUpdateAs(
-                user,
-                USERS_TABLE_NAME,
-                user.getId(),
-                Map.of("tokenVersion", previousTokenVersion),
-                Map.of("event", PASSWORD_RESET_AUDIT_EVENT, "tokenVersion", user.getTokenVersion()),
-                PASSWORD_RESET_AUDIT_EVENT
-        );
+        return user != null
+                && user.getStatus() == UserStatus.active;
     }
-}
+}

src/main/java/com/jamil/ahadith/features/audit/dto/response/ActivityLogResponseDto.java

@@ -5,6 +5,7 @@
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.UUID;
+import java.util.List;
 
 @Data
 public class ActivityLogResponseDto {
@@ -18,5 +19,6 @@ public class ActivityLogResponseDto {
     private UUID recordId;
     private Map<String, Object> oldData;
     private Map<String, Object> newData;
+    private List<String> changes;
     private LocalDateTime createdAt;
 }