Skip to content

Commit e581da0

Browse files
committed
refactor: update authentication logic to use UserPrincipal for user retrieval
1 parent ba6e6d9 commit e581da0

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

backend/spring-boot/src/main/java/org/bugzkit/api/auth/service/impl/AuthServiceImpl.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.bugzkit.api.auth.payload.request.ResetPasswordRequest;
1111
import org.bugzkit.api.auth.payload.request.VerificationEmailRequest;
1212
import org.bugzkit.api.auth.payload.request.VerifyEmailRequest;
13+
import org.bugzkit.api.auth.security.UserPrincipal;
1314
import org.bugzkit.api.auth.service.AccessTokenService;
1415
import org.bugzkit.api.auth.service.AuthService;
1516
import org.bugzkit.api.auth.service.DeviceService;
@@ -91,14 +92,15 @@ public UserDTO register(RegisterUserRequest registerUserRequest) {
9192
@Override
9293
public AuthTokens authenticate(
9394
AuthTokensRequest authTokensRequest, String deviceId, String userAgent) {
94-
final var auth =
95+
final var authToken =
9596
new UsernamePasswordAuthenticationToken(
9697
authTokensRequest.usernameOrEmail(), authTokensRequest.password(), new ArrayList<>());
97-
authenticationManager.authenticate(auth);
98+
final var authenticated = authenticationManager.authenticate(authToken);
99+
final var principal = (UserPrincipal) authenticated.getPrincipal();
98100

99101
final var user =
100102
userRepository
101-
.findWithRolesByUsername(auth.getName())
103+
.findWithRolesById(principal.getId())
102104
.orElseThrow(() -> new UnauthorizedException("auth.unauthorized"));
103105
final var roleDTOs = userMapper.rolesToRoleDTOs(user.getRoles());
104106
final var accessToken = accessTokenService.create(user.getId(), roleDTOs, deviceId);

0 commit comments

Comments
 (0)