Skip to content

[WIP] Fix failing GitHub Actions job Maven verify #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −0
Draft

[WIP] Fix failing GitHub Actions job Maven verify #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605c046
Initial plan
Copilot Sep 8, 2026
067d0ab
Restore audit logs for user profile and password updates
Copilot Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/com/jamil/ahadith/features/account/service/PasswordResetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import com.jamil.ahadith.core.security.RefreshTokenRevoker;
import com.jamil.ahadith.core.validation.EmailNormalizer;
import com.jamil.ahadith.core.web.dto.MessageResponseDto;
import com.jamil.ahadith.features.audit.service.AuditData;
import com.jamil.ahadith.features.audit.service.AuditEventPublisher;
import com.jamil.ahadith.features.account.dto.request.ResetPasswordRequestDto;
import com.jamil.ahadith.features.account.entity.PasswordResetToken;
import com.jamil.ahadith.features.account.event.AccountEmailEvent;
Expand All @@ -31,6 +33,7 @@ public class PasswordResetService {
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 USERS_TABLE_NAME = "users";

private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder;
Expand All @@ -43,6 +46,7 @@ public class PasswordResetService {
private final RateLimitKeyResolver rateLimitKeyResolver;
private final OneTimeTokenValidator oneTimeTokenValidator;
private final ApplicationEventPublisher eventPublisher;
private final AuditEventPublisher auditEventPublisher;

@Transactional
public MessageResponseDto forgotPassword(String email) {
Expand Down Expand Up @@ -86,6 +90,7 @@ public MessageResponseDto resetPassword(ResetPasswordRequestDto request) {

User user = resetToken.getUser();
requireActive(user);
var oldData = AuditData.snapshot(user);

String encodedPassword =
passwordEncoder.encode(request.getNewPassword());
Expand All @@ -99,6 +104,15 @@ public MessageResponseDto resetPassword(ResetPasswordRequestDto request) {

passwordResetTokenRepository.consumeActiveForUser(user, now);

auditEventPublisher.publishUpdateAs(
user,
USERS_TABLE_NAME,
user.getId(),
oldData,
AuditData.snapshot(user),
"password reset"
);

return new MessageResponseDto(
"Password has been reset"
);
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/jamil/ahadith/features/user/service/UserProfileTransactionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.jamil.ahadith.core.security.RefreshTokenRevoker;
import com.jamil.ahadith.core.storage.dto.ProfileImageResponse;
import com.jamil.ahadith.core.web.dto.MessageResponseDto;
import com.jamil.ahadith.features.audit.service.AuditData;
import com.jamil.ahadith.features.audit.service.AuditEventPublisher;
import com.jamil.ahadith.features.account.service.PasswordPolicyService;
import com.jamil.ahadith.features.auth.dto.response.AuthUserDto;
import com.jamil.ahadith.features.auth.mapper.AuthUserMapper;
Expand All @@ -24,13 +26,15 @@
@Service
@RequiredArgsConstructor
public class UserProfileTransactionService {
private static final String USERS_TABLE_NAME = "users";

private final UserRepository userRepository;
private final ApplicationEventPublisher eventPublisher;
private final AuthUserMapper authUserMapper;
private final PasswordEncoder passwordEncoder;
private final PasswordPolicyService passwordPolicyService;
private final RefreshTokenRevoker refreshTokenRevoker;
private final AuditEventPublisher auditEventPublisher;

@Transactional
public void replaceProfileImage(
Expand Down Expand Up @@ -86,11 +90,21 @@ public AuthUserDto updateProfile(
User user = userRepository
.findByIdForUpdate(userId)
.orElseThrow(UserNotFoundException::new);
var oldData = AuditData.snapshot(user);

user.setName(request.getName().trim());
user.setGender(request.getGender());
user.setBirthDate(request.getBirthDate());

auditEventPublisher.publishUpdateAs(
user,
USERS_TABLE_NAME,
user.getId(),
oldData,
AuditData.snapshot(user),
"profile updated"
);

return authUserMapper.toDto(user);
}

Expand All @@ -106,6 +120,7 @@ public MessageResponseDto changePassword(
User user = userRepository
.findByIdForUpdate(userId)
.orElseThrow(UserNotFoundException::new);
var oldData = AuditData.snapshot(user);

if (user.getPassword() == null
|| !passwordEncoder.matches(
Expand Down Expand Up @@ -140,6 +155,15 @@ public MessageResponseDto changePassword(

refreshTokenRevoker.revokeAllForUser(user);

auditEventPublisher.publishUpdateAs(
user,
USERS_TABLE_NAME,
user.getId(),
oldData,
AuditData.snapshot(user),
"password changed"
);

return new MessageResponseDto(
"Password changed successfully"
);
Expand Down