TouchInstinct
/
Backend-common
305
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add UserCoreService logout method

This commit is contained in:
Mikhail Yasnov 2021-07-08 16:51:26 +03:00
parent 0de74ca3a8
commit 2eeab2dade
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auth-core/src/main/kotlin/ru/touchin/auth/core/user/services/UserCoreService.kt
View File

@ -7,7 +7,7 @@ import ru.touchin.auth.core.user.services.dto.GetUserAccount
import ru.touchin.auth.core.user.services.dto.NewAnonymousUser
import ru.touchin.auth.core.user.services.dto.NewUser
import ru.touchin.auth.core.user.services.dto.UserLogin
import java.util.UUID
import ru.touchin.auth.core.user.services.dto.UserLogout
interface UserCoreService {
@ -17,5 +17,6 @@ interface UserCoreService {
fun getUserAccount(userAccount: GetUserAccount): UserAccount
fun getOrNull(username: String, identifierType: IdentifierType): User?
fun login(userLogin: UserLogin): User
fun logout(userLogout: UserLogout)
}

17
auth-core/src/main/kotlin/ru/touchin/auth/core/user/services/UserCoreServiceImpl.kt
View File

@ -2,7 +2,6 @@
package ru.touchin.auth.core.user.services
import org.springframework.data.repository.findByIdOrNull
import org.springframework.security.crypto.password.PasswordEncoder
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
@ -25,13 +24,14 @@ import ru.touchin.auth.core.user.models.UserAccountEntity
import ru.touchin.auth.core.user.models.UserEntity
import ru.touchin.auth.core.user.repositories.UserAccountRepository
import ru.touchin.auth.core.user.repositories.UserRepository
import ru.touchin.auth.core.user.repositories.findByIdOrThrow
import ru.touchin.auth.core.user.repositories.findByUserIdOrThrow
import ru.touchin.auth.core.user.repositories.findByUsernameOrThrow
import ru.touchin.auth.core.user.services.dto.GetUserAccount
import ru.touchin.auth.core.user.services.dto.NewAnonymousUser
import ru.touchin.auth.core.user.services.dto.NewUser
import ru.touchin.auth.core.user.services.dto.UserLogin
import java.util.UUID
import ru.touchin.auth.core.user.services.dto.UserLogout
@Service
class UserCoreServiceImpl(
@ -114,6 +114,19 @@ class UserCoreServiceImpl(
return user.toDto(device.toDto())
}
@Transactional
override fun logout(userLogout: UserLogout) {
val device = deviceRepository.findByIdWithLockOrThrow(userLogout.deviceId)
resetDeviceUsers(device)
userRepository.findByIdOrThrow(userLogout.userId)
.apply {
devices = hashSetOf()
}
.also(userRepository::save)
}
@Transactional(readOnly = true)
override fun get(username: String, identifierType: IdentifierType): User {
return getOrNull(username, identifierType)

8
auth-core/src/main/kotlin/ru/touchin/auth/core/user/services/dto/UserLogout.kt Normal file
View File

@ -0,0 +1,8 @@
package ru.touchin.auth.core.user.services.dto
import java.util.UUID
data class UserLogout(
val deviceId: UUID,
val userId: UUID,
)