diff --git a/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt b/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt index 6bba011..c7ab743 100644 --- a/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt +++ b/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt @@ -77,7 +77,11 @@ class UserServiceST( if (!tokenManager.hasTokens()) { throw RuntimeException("access token is null") } - return userRepository.getInfo(tokenManager.authTokenPair!!.accessToken) + val result = userRepository.getInfo(tokenManager.authTokenPair!!.accessToken) + result.map { dto -> + saveUserDTO(dto) + } + return result } suspend fun getInfoByLogin(login: String): Result{ if (!tokenManager.hasTokens()) { diff --git a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt index 3a159e6..3bc62c6 100644 --- a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt @@ -74,11 +74,8 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { if (userDTO.roles.any { it.name == "ROLE_ADMIN" }) { binding.buttonSearch.visibility = View.VISIBLE - binding.rightsUsingSmartphone.text = "Пропуск действителен" - } - if (userDTO.roles.any { it.name == "ROLE_USER" }) { - binding.rightsUsingSmartphone.text = "Пропуск действителен" } + binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск действителен" else "Пропуск действителен" } private fun hideButtons() {