Implementation of refresh token.
This commit is contained in:
@@ -1,49 +0,0 @@
|
||||
package org.sportshub.infrastructure.user.adapter;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.sportshub.domain.user.model.UserRole.ADMIN;
|
||||
import static org.sportshub.domain.user.model.UserRole.STANDARD;
|
||||
import org.sportshub.domain.user.model.User;
|
||||
import org.sportshub.domain.user.port.UserPort;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
//@Component
|
||||
public class UserInMemoryAdapter implements UserPort {
|
||||
private static final List<User> users = List.of(
|
||||
new User(
|
||||
UUID.fromString("c1a0805f-c618-47dc-bae7-bee70503644e"),
|
||||
"$2a$10$WPuLOKpvaQnMotNo5ijPwegBPwmMF1C04XkTNCBpeBFo4r2YJWy.2",
|
||||
List.of(STANDARD)
|
||||
),
|
||||
new User(
|
||||
UUID.fromString("4eff194d-dd8e-463e-974f-034bfd509f84"),
|
||||
"$2a$10$WPuLOKpvaQnMotNo5ijPwegBPwmMF1C04XkTNCBpeBFo4r2YJWy.2",
|
||||
List.of(STANDARD)
|
||||
),
|
||||
new User(
|
||||
UUID.fromString("c78d7d7c-0386-415d-86dc-98a470591e07"),
|
||||
"$2a$10$WPuLOKpvaQnMotNo5ijPwegBPwmMF1C04XkTNCBpeBFo4r2YJWy.2",
|
||||
List.of(STANDARD, ADMIN)
|
||||
)
|
||||
);
|
||||
|
||||
@Override
|
||||
public Optional<User> findById(final UUID userId) {
|
||||
return users.stream()
|
||||
.filter(user -> userId.equals(user.id()))
|
||||
.findFirst();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<User> findAll() {
|
||||
return users;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save(final User user) {
|
||||
// Do nothing.
|
||||
}
|
||||
}
|
||||
@@ -4,43 +4,68 @@ import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.sportshub.domain.user.model.RefreshToken;
|
||||
import org.sportshub.domain.user.model.User;
|
||||
import org.sportshub.domain.user.port.UserPort;
|
||||
import org.sportshub.infrastructure.user.mapper.UserMapper;
|
||||
import org.sportshub.infrastructure.user.model.RefreshTokenEntity;
|
||||
import org.sportshub.infrastructure.user.model.UserEntity;
|
||||
import org.sportshub.infrastructure.user.repository.RefreshTokenJpaRepository;
|
||||
import org.sportshub.infrastructure.user.repository.UserJpaRepository;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class UserJpaAdapter implements UserPort {
|
||||
private final RefreshTokenJpaRepository refreshTokenJpaRepository;
|
||||
private final UserJpaRepository userJpaRepository;
|
||||
private final UserMapper userMapper;
|
||||
|
||||
public UserJpaAdapter(
|
||||
UserJpaRepository userJpaRepository,
|
||||
UserMapper userMapper
|
||||
RefreshTokenJpaRepository refreshTokenJpaRepository,
|
||||
UserJpaRepository userJpaRepository
|
||||
) {
|
||||
this.refreshTokenJpaRepository = refreshTokenJpaRepository;
|
||||
this.userJpaRepository = userJpaRepository;
|
||||
this.userMapper = userMapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<User> findById(final UUID userId) {
|
||||
public Optional<User> findById(UUID userId) {
|
||||
return userJpaRepository.findById(userId)
|
||||
.map(userMapper::mapFrom);
|
||||
.map(UserEntity::toUser);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<User> findAll() {
|
||||
return userJpaRepository.findAll()
|
||||
.stream()
|
||||
.map(userMapper::mapFrom)
|
||||
.map(UserEntity::toUser)
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save(User user) {
|
||||
UserEntity userEntity = userMapper.mapTo(user);
|
||||
UserEntity userEntity = new UserEntity(user);
|
||||
userJpaRepository.save(userEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean existsById(final UUID userId) {
|
||||
return userJpaRepository.existsById(userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<RefreshToken> findRefreshTokenByUserId(UUID userId) {
|
||||
return refreshTokenJpaRepository.findByUserId(userId)
|
||||
.map(RefreshTokenEntity::toRefreshToken);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<RefreshToken> findRefreshTokenById(UUID refreshTokenId) {
|
||||
return refreshTokenJpaRepository.findByValue(refreshTokenId)
|
||||
.map(RefreshTokenEntity::toRefreshToken);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save(RefreshToken refreshToken) {
|
||||
RefreshTokenEntity refreshTokenEntity = new RefreshTokenEntity(refreshToken);
|
||||
refreshTokenJpaRepository.save(refreshTokenEntity);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package org.sportshub.infrastructure.user.mapper;
|
||||
|
||||
import org.sportshub.domain.user.model.User;
|
||||
import org.sportshub.infrastructure.user.model.UserEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class UserMapper {
|
||||
public User mapFrom(UserEntity userEntity) {
|
||||
return new User(userEntity.getId(), userEntity.getPassword(), userEntity.getRoles());
|
||||
}
|
||||
|
||||
public UserEntity mapTo(User user) {
|
||||
return new UserEntity(
|
||||
user.id(),
|
||||
user.password(),
|
||||
user.roles()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package org.sportshub.infrastructure.user.model;
|
||||
|
||||
import java.time.ZonedDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.sportshub.domain.user.model.RefreshToken;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Entity
|
||||
@Table(name = "refresh_token")
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Getter
|
||||
@Setter
|
||||
public class RefreshTokenEntity {
|
||||
@Id
|
||||
private UUID userId;
|
||||
@Column(nullable = false)
|
||||
private UUID value;
|
||||
@Column(nullable = false)
|
||||
private ZonedDateTime expirationDate;
|
||||
|
||||
public RefreshTokenEntity(RefreshToken refreshToken) {
|
||||
userId = refreshToken.userId();
|
||||
value = refreshToken.value();
|
||||
expirationDate = refreshToken.expirationDate();
|
||||
}
|
||||
|
||||
public RefreshToken toRefreshToken() {
|
||||
return new RefreshToken(userId, value, expirationDate);
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package org.sportshub.infrastructure.user.model;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.sportshub.domain.user.model.User;
|
||||
import org.sportshub.domain.user.model.UserRole;
|
||||
|
||||
import jakarta.persistence.CollectionTable;
|
||||
@@ -37,4 +38,18 @@ public class UserEntity {
|
||||
)
|
||||
@Column(name = "role")
|
||||
private List<UserRole> roles;
|
||||
|
||||
public UserEntity(User user) {
|
||||
id = user.id();
|
||||
password = user.password();
|
||||
roles = user.roles();
|
||||
}
|
||||
|
||||
public User toUser() {
|
||||
return new User(
|
||||
id,
|
||||
password,
|
||||
roles
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package org.sportshub.infrastructure.user.repository;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.sportshub.infrastructure.user.model.RefreshTokenEntity;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface RefreshTokenJpaRepository extends JpaRepository<RefreshTokenEntity, UUID> {
|
||||
Optional<RefreshTokenEntity> findByUserId(UUID userId);
|
||||
|
||||
Optional<RefreshTokenEntity> findByValue(UUID refreshTokenId);
|
||||
}
|
||||
@@ -8,9 +8,9 @@ import org.sportshub.infrastructure.user.model.UserEntity;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Service
|
||||
@Repository
|
||||
public interface UserJpaRepository extends JpaRepository<UserEntity, UUID> {
|
||||
@Query("SELECT u FROM UserEntity u JOIN FETCH u.roles WHERE u.id = :userId")
|
||||
Optional<UserEntity> findById(@Param("userId") UUID userId);
|
||||
|
||||
@@ -10,4 +10,13 @@ CREATE TABLE IF NOT EXISTS user_role (
|
||||
CONSTRAINT user_role_pk PRIMARY KEY (user_id, role),
|
||||
CONSTRAINT user_role_fk_user_id FOREIGN KEY (user_id) REFERENCES "user" (id)
|
||||
);
|
||||
CREATE INDEX user_role_fk_user_id_idx ON user_role (user_id);
|
||||
CREATE INDEX user_role_fk_user_id_idx ON user_role (user_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS refresh_token (
|
||||
user_id UUID NOT NULL,
|
||||
value UUID NOT NULL,
|
||||
expiration_date TIMESTAMP NOT NULL,
|
||||
CONSTRAINT refresh_token_pk PRIMARY KEY (user_id),
|
||||
CONSTRAINT refresh_token_fk_user_id FOREIGN KEY (user_id) REFERENCES "user" (id)
|
||||
);
|
||||
CREATE INDEX refresh_token_fk_user_id_idx ON user_role (user_id);
|
||||
Reference in New Issue
Block a user