atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Move auth response handling to runCatching

Browse Source 
runCatching is easier to read and understand than mapCatching
This commit is contained in:
Kirill Kamakin
2021-11-27 00:18:56 +03:00
parent b5606f3241
commit dc6084ee25
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
View File

@@ -30,17 +30,18 @@ class AuthDataSourceImpl @Inject constructor(
val authService = retrofitBuilder.buildRetrofit(baseUrl).create<AuthService>() val authService = retrofitBuilder.buildRetrofit(baseUrl).create<AuthService>()
val accessToken = runCatching { val accessToken = runCatching {
authService.getToken(username, password) val response = authService.getToken(username, password)
}.mapCatching { Timber.d("authenticate() response is $response")
Timber.d("authenticate() response is $it") if (response.isSuccessful) {
if (!it.isSuccessful) { checkNotNull(response.body()).accessToken
val cause = HttpException(it) } else {
throw when (it.decodeErrorBodyOrNull<GetTokenResponse, ErrorDetail>()?.detail) { val cause = HttpException(response)
val errorDetail: ErrorDetail? = response.decodeErrorBodyOrNull(json)
throw when (errorDetail?.detail) {
"Unauthorized" -> Unauthorized(cause) "Unauthorized" -> Unauthorized(cause)
else -> NotMealie(cause) else -> NotMealie(cause)
} }
} }
checkNotNull(it.body()).accessToken // Can't be null here, would throw SerializationException
}.onFailure { }.onFailure {
Timber.e(it, "authenticate: getToken failed") Timber.e(it, "authenticate: getToken failed")
throw when (it) { throw when (it) {