wbrawner/twigs
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages 1 Wiki Activity Actions

Allow login with username or email

Browse source
This commit is contained in:
Billy Brawner 2019-10-29 12:15:31 -06:00
parent 6191ed9fe4
commit 08ecc1ce26
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/com/wbrawner/budgetserver/config/JdbcUserDetailsService.kt
View file

@ -13,7 +13,12 @@ constructor(private val userRepository: UserRepository) : UserDetailsService {
@Throws(UsernameNotFoundException::class) @Throws(UsernameNotFoundException::class)
override fun loadUserByUsername(username: String): UserDetails { override fun loadUserByUsername(username: String): UserDetails {
return userRepository.findByName(username).orElse(null) userRepository.findByName(username).orElse(null)?.let {
?: throw UsernameNotFoundException("Unable to find user with username $username") return it
}
userRepository.findByEmail(username).orElse(null)?.let {
return it
}
throw UsernameNotFoundException("Unable to find user with username $username")
} }
} }