commit
This commit is contained in:
@@ -27,14 +27,16 @@ public class UserDetailsServiceImpl implements UserDetailsService {
|
||||
var user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new UsernameNotFoundException("User not found: " + username));
|
||||
|
||||
boolean active = Boolean.TRUE.equals(user.getActive());
|
||||
|
||||
return User.builder()
|
||||
.username(user.getUsername())
|
||||
.password(user.getPassword())
|
||||
.authorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_USER")))
|
||||
.accountNonLocked(user.getActive())
|
||||
.accountNonExpired(true)
|
||||
.credentialsNonExpired(true)
|
||||
.enabled(user.getActive())
|
||||
.accountLocked(!active)
|
||||
.accountExpired(false)
|
||||
.credentialsExpired(false)
|
||||
.disabled(!active)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
spring:
|
||||
application:
|
||||
name: mtg-search
|
||||
version: 0.1.0
|
||||
name: ${app.name:mtg-search}
|
||||
version: ${app.version:0.1.0}
|
||||
|
||||
datasource:
|
||||
url: jdbc:postgresql://localhost:5432/mtgsearch
|
||||
username: postgres
|
||||
password: postgres
|
||||
url: ${db.url:jdbc:postgresql://localhost:5432/mtgsearch}
|
||||
username: ${db.user:postgres}
|
||||
password: ${db.password:postgres}
|
||||
hikari:
|
||||
maximum-pool-size: 10
|
||||
maximum-pool-size: ${db.maxPoolSize:10}
|
||||
minimum-idle: 2
|
||||
idle-timeout: 300000
|
||||
max-lifetime: 1200000
|
||||
@@ -37,10 +37,21 @@ spring:
|
||||
max-file-size: 10MB
|
||||
max-request-size: 10MB
|
||||
|
||||
server:
|
||||
port: ${server.port:8080}
|
||||
servlet:
|
||||
context-path: ${server.servlet.contextPath:/}
|
||||
|
||||
app:
|
||||
jwt:
|
||||
secret: ${JWT_SECRET:your-secret-key-change-in-production}
|
||||
expiration: ${JWT_EXPIRATION:86400}
|
||||
secret: ${jwt.secret:your-secret-key-change-in-production}
|
||||
expiration: ${jwt.expiration:86400}
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: ${log.level:INFO}
|
||||
file:
|
||||
name: ${log.dir:logs}/app.log
|
||||
|
||||
springdoc:
|
||||
api-docs:
|
||||
|
||||
Reference in New Issue
Block a user