Skip to content

Handle non-retryable exception in FCM session keep-alive #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kennethshackleton wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Handle non-retryable exception in FCM session keep-alive #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pushiko-fcm/src/main/kotlin/com/bloomberg/pushiko/fcm/oauth/CredentialsRefreshManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,18 @@ internal class CredentialsRefreshManager(
logger.info("Scheduling task to refresh access token, delayed {}s", it)
}
delay(interval)
if (iterator.next() != null) {
val token = try {
iterator.next()
} catch (e: IOException) {
if (e is Retryable && !e.isRetryable) {
logger.error(
"Non-retryable OAuth failure during keep-alive, token refresh has permanently stopped: {}",
e.message
)
}
throw e
}
if (token != null) {
backOff.reset()
}
keepAlive()
Expand Down
22 changes: 22 additions & 0 deletions pushiko-fcm/src/test/kotlin/com/bloomberg/pushiko/fcm/oauth/CredentialsRefreshManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertSame
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.doThrow

internal class CredentialsRefreshManagerTest {
Expand Down Expand Up @@ -107,6 +108,27 @@ internal class CredentialsRefreshManagerTest {
}
}

@Test
fun keepAliveStopsWhenRefreshFailureIsNonRetryable() {
val credentials = mock<OAuth2Credentials>()
val exception = NonRetryableIOException("invalid_grant")
val backOff = mock<BackOff>()
var callCount = 0
whenever(credentials.refresh()).thenAnswer {
if (callCount++ == 0) {
whenever(credentials.accessToken).thenReturn(
AccessToken(FAKE_TOKEN, Date(System.currentTimeMillis() + DEFAULT_EXPIRY_MILLIS))
)
} else {
throw exception
}
}
whenever(backOff.nextBackOffMillis()) doReturn 0L
assertFailsWith<IllegalStateException> {
manager = CredentialsRefreshManager(credentials, Dispatchers.Unconfined, backOff)
}
}

private companion object {
private const val DEFAULT_EXPIRY_MILLIS = 10_000L * 1_000L
private const val FAKE_TOKEN = "abc123"
Expand Down