fix: fix some stuff
This commit is contained in:
parent
793f3f6834
commit
df9fa9f275
10 changed files with 132 additions and 24 deletions
|
@ -1,25 +1,55 @@
|
|||
package de.szut.casino.user;
|
||||
|
||||
import de.szut.casino.user.dto.CreateUserDto;
|
||||
import de.szut.casino.user.dto.GetUserDto;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class UserController {
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
|
||||
@GetMapping("/user/{id}")
|
||||
public ResponseEntity<?> getUser(@PathVariable String id) {
|
||||
if (id == null || !userService.exists(id)) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
return ResponseEntity.ok(userService.getUser(id));
|
||||
}
|
||||
|
||||
@PostMapping("/user")
|
||||
public ResponseEntity<?> createUser(@RequestBody @Valid CreateUserDto userData) {
|
||||
if (userService.exists(userData.getKeycloakId())) {
|
||||
|
||||
return this.redirect("/user/" + userData.getKeycloakId());
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(userService.createUser(userData));
|
||||
}
|
||||
|
||||
@GetMapping("/user")
|
||||
public ResponseEntity<GetUserDto> getCurrentUser(@RequestHeader("Authorization") String token) {
|
||||
GetUserDto userData = userService.getCurrentUser(token);
|
||||
|
||||
if (userData == null) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(userData);
|
||||
}
|
||||
|
||||
private ResponseEntity<Object> redirect(String route) {
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.add("Location", route);
|
||||
|
||||
return new ResponseEntity<>(headers, HttpStatus.FOUND);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package de.szut.casino.user;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
|
@ -13,6 +14,8 @@ public class UserEntity {
|
|||
@Id
|
||||
@GeneratedValue
|
||||
private Long id;
|
||||
@Column(unique = true)
|
||||
private String keycloakId;
|
||||
private String username;
|
||||
private float balance;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
package de.szut.casino.user;
|
||||
|
||||
import de.szut.casino.user.dto.CreateUserDto;
|
||||
import de.szut.casino.user.dto.GetUserDto;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class UserMappingService {
|
||||
public GetUserDto mapToGetUserDto(UserEntity user) {
|
||||
return new GetUserDto(user.getKeycloakId(), user.getUsername(), user.getBalance());
|
||||
}
|
||||
|
||||
public UserEntity mapToUserEntity(CreateUserDto createUserDto) {
|
||||
UserEntity user = new UserEntity();
|
||||
user.setKeycloakId(createUserDto.getKeycloakId());
|
||||
user.setUsername(createUserDto.getUsername());
|
||||
user.setBalance(0);
|
||||
|
||||
return user;
|
||||
}
|
||||
}
|
||||
|
|
@ -8,9 +8,8 @@ import java.util.Optional;
|
|||
|
||||
@Service
|
||||
public interface UserRepository extends JpaRepository<UserEntity, Long> {
|
||||
boolean existsByUsername(String username);
|
||||
|
||||
@Query("SELECT u FROM UserEntity u WHERE u.keycloakId = ?1")
|
||||
Optional<UserEntity> findOneByKeycloakId(String keycloakId);
|
||||
|
||||
boolean existsByKeycloakId(String keycloakId);
|
||||
}
|
||||
|
|
|
@ -2,9 +2,21 @@ package de.szut.casino.user;
|
|||
|
||||
import de.szut.casino.user.dto.CreateUserDto;
|
||||
import de.szut.casino.user.dto.GetUserDto;
|
||||
import de.szut.casino.user.dto.KeycloakUserDto;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpEntity;
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.time.Duration;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
@Service
|
||||
|
@ -12,10 +24,14 @@ public class UserService {
|
|||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Autowired
|
||||
private RestTemplate http;
|
||||
|
||||
@Autowired
|
||||
private UserMappingService mappingService;
|
||||
|
||||
public UserEntity createUser(CreateUserDto createUserDto) {
|
||||
UserEntity user = new UserEntity();
|
||||
user.setUsername(createUserDto.getUsername());
|
||||
user.setKeycloakId(createUserDto.getKeycloakId());
|
||||
UserEntity user = mappingService.mapToUserEntity(createUserDto);
|
||||
userRepository.save(user);
|
||||
|
||||
return user;
|
||||
|
@ -23,15 +39,31 @@ public class UserService {
|
|||
|
||||
public GetUserDto getUser(String keycloakId) {
|
||||
Optional<UserEntity> user = this.userRepository.findOneByKeycloakId(keycloakId);
|
||||
if (user.isPresent()) {
|
||||
System.out.println(user.get());
|
||||
GetUserDto getUserDto = new GetUserDto();
|
||||
getUserDto.setKeycloakId(user.get().getKeycloakId());
|
||||
getUserDto.setUsername(user.get().getUsername());
|
||||
return getUserDto;
|
||||
}
|
||||
System.out.println("User not found: "+keycloakId);
|
||||
return user.map(userEntity -> mappingService.mapToGetUserDto(userEntity)).orElse(null);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public GetUserDto getCurrentUser(String token) {
|
||||
KeycloakUserDto userData = getKeycloakUserInfo(token);
|
||||
|
||||
if (userData == null) {
|
||||
return null;
|
||||
}
|
||||
Optional<UserEntity> user = this.userRepository.findOneByKeycloakId(userData.getSub());
|
||||
|
||||
return user.map(userEntity -> mappingService.mapToGetUserDto(userEntity)).orElse(null);
|
||||
|
||||
}
|
||||
|
||||
private KeycloakUserDto getKeycloakUserInfo(String token) {
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("Authorization", token);
|
||||
ResponseEntity<KeycloakUserDto> response = this.http.exchange("http://localhost:9090/realms/LF12/protocol/openid-connect/userinfo", HttpMethod.GET, new HttpEntity<>(headers), KeycloakUserDto.class);
|
||||
|
||||
return response.getBody();
|
||||
}
|
||||
|
||||
public boolean exists(String keycloakId) {
|
||||
return userRepository.existsByKeycloakId(keycloakId);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,4 +12,5 @@ import lombok.Setter;
|
|||
public class GetUserDto {
|
||||
private String keycloakId;
|
||||
private String username;
|
||||
private float balance;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
package de.szut.casino.user.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class KeycloakUserDto {
|
||||
private String sub;
|
||||
private String preferred_username;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue