Skip to content

Commit d015524

Browse files
author
Standa
committed
removes forceLogout exception
1 parent fb1b08c commit d015524

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

apollo-service/src/main/java/com/qusion/apolloservice/exceptions/NetworkExceptions.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ package com.qusion.apolloservice.exceptions
55
open class BusinessException(override val message: String?) : Exception(message)
66

77
/** Thrown by the http interceptor when there is 401 from the server */
8-
open class ExpiredSidException(override val message: String?) : Exception(message)
9-
10-
/** Thrown by ApolloService when refresh token mutation fails */
11-
open class ForceLogoutException(code: String) : ExpiredSidException(code)
8+
open class ExpiredSidException(override val message: String?) : Exception(message)

apollo-service/src/main/java/com/qusion/apolloservice/impl/ApolloServiceImpl.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.qusion.apolloservice.IRefreshToken
1717
import com.qusion.apolloservice.api.IApolloService
1818
import com.qusion.apolloservice.exceptions.BusinessException
1919
import com.qusion.apolloservice.exceptions.ExpiredSidException
20-
import com.qusion.apolloservice.exceptions.ForceLogoutException
2120
import com.qusion.kotlin.lib.extensions.network.NetworkResult
2221
import kotlinx.coroutines.Dispatchers
2322
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -87,7 +86,7 @@ class ApolloServiceImpl<T>(
8786
if (e.cause is ExpiredSidException && refreshToken != null) {
8887
val refreshResult = refreshToken.refreshToken()
8988
if (refreshResult is NetworkResult.Error) {
90-
return NetworkResult.Error(ForceLogoutException("Token refresh failed"))
89+
return refreshResult
9190
}
9291

9392
query(query)
@@ -107,7 +106,7 @@ class ApolloServiceImpl<T>(
107106

108107
val refreshResult = refreshToken.refreshToken()
109108
if (refreshResult is NetworkResult.Error) {
110-
return NetworkResult.Error(ForceLogoutException("Token refresh failed"))
109+
return refreshResult
111110
}
112111
mutate(mutation)
113112
} else {
@@ -137,7 +136,7 @@ class ApolloServiceImpl<T>(
137136

138137
val refreshResult = refreshToken.refreshToken()
139138
if (refreshResult is NetworkResult.Error) {
140-
emit(NetworkResult.Error(ForceLogoutException("Token refresh failed")))
139+
emit(refreshResult)
141140
} else {
142141
emit(query(query))
143142
}

0 commit comments

Comments
 (0)