refactor(deposit, user): rename Keycloak to Authentik user info
Some checks failed
CI / Get Changed Files (pull_request) Successful in 6s
CI / eslint (pull_request) Failing after 25s
CI / test-build (pull_request) Successful in 33s
CI / prettier (pull_request) Failing after 56s
CI / Checkstyle Main (pull_request) Successful in 2m0s

This commit is contained in:
Jan K9f 2025-04-02 16:09:34 +02:00
commit fa09a8533f
Signed by: jank
GPG key ID: B9F475106B20F144
4 changed files with 23 additions and 5 deletions

View file

@ -47,7 +47,7 @@ public class DepositController {
public ResponseEntity<SessionIdDto> checkout(@RequestBody @Valid AmountDto amountDto, @RequestHeader("Authorization") String token) throws StripeException {
Stripe.apiKey = stripeKey;
KeycloakUserDto userData = getKeycloakUserInfo(token);
KeycloakUserDto userData = getAuthentikUserInfo(token);
Optional<UserEntity> optionalUserEntity = this.userRepository.findOneByAuthentikId(userData.getSub());
SessionCreateParams params = SessionCreateParams.builder()
@ -77,7 +77,7 @@ public class DepositController {
return ResponseEntity.ok(new SessionIdDto(session.getId()));
}
private KeycloakUserDto getKeycloakUserInfo(String token) {
private KeycloakUserDto getAuthentikUserInfo(String token) {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", token);
ResponseEntity<KeycloakUserDto> response = this.restTemplate.exchange("https://oauth.simonis.lol/application/o/userinfo/", HttpMethod.GET, new HttpEntity<>(headers), KeycloakUserDto.class);

View file

@ -49,12 +49,12 @@ public class UserService {
}
public Optional<UserEntity> getCurrentUser(String token) {
KeycloakUserDto userData = getKeycloakUserInfo(token);
KeycloakUserDto userData = getAuthentikUserInfo(token);
if (userData == null) {
return Optional.empty();
}
return this.userRepository.findOneByKeycloakId(userData.getSub());
return this.userRepository.findOneByAuthentikId(userData.getSub());
}
private KeycloakUserDto getAuthentikUserInfo(String token) {

View file

@ -10,6 +10,8 @@ import lombok.Setter;
@AllArgsConstructor
@NoArgsConstructor
public class KeycloakUserDto {
// Renamed class but kept for backward compatibility
// This now contains Authentik user info
private String sub;
private String preferred_username;
}