Skip to content

[Quest/MWCore] Fix refresh token not invalidating on network Exception #1822

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

Merged
merged 1 commit into from
Nov 10, 2022
Merged

[Quest/MWCore] Fix refresh token not invalidating on network Exception #1822

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
5 changes: 3 additions & 2 deletions android/engine/src/main/java/org/smartregister/fhircore/engine/auth/AccountAuthenticator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,15 @@ constructor(

fun getUserInfo(): Call<ResponseBody> = oAuthService.userInfo()

@Throws(NetworkErrorException::class)
fun refreshToken(refreshToken: String): OAuthResponse? {
val data = buildOAuthPayload(REFRESH_TOKEN)
data[REFRESH_TOKEN] = refreshToken
return try {
oAuthService.fetchToken(data).execute().body()
} catch (exception: Exception) {
Timber.e("Failed to refresh token, refresh token may have expired", exception)
return null
throw NetworkErrorException(exception)
}
}

Expand Down Expand Up @@ -349,7 +350,7 @@ constructor(
launchScreen(AppSettingActivity::class.java)
}

fun loadRefreshedSessionAccount(callback: AccountManagerCallback<Bundle>) {
fun refreshSessionAuthToken(callback: AccountManagerCallback<Bundle>) {
tokenManagerService.getActiveAccount()?.run {
val accountType = getAccountType()
var authToken = accountManager.peekAuthToken(this, accountType)
Expand Down
9 changes: 7 additions & 2 deletions ...d/engine/src/test/java/org/smartregister/fhircore/engine/auth/AccountAuthenticatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,15 +482,20 @@ class AccountAuthenticatorTest : RobolectricTest() {

@Test
fun loadRefreshedSessionAccountRefreshesAccessTokenIfExpired() = runBlockingTest {
val callMock = mockk<Call<OAuthResponse>>()
val mockResponse = Response.success<OAuthResponse?>(OAuthResponse("testToken"))
every { callMock.execute() } returns mockResponse
every { oAuthService.fetchToken(any()) } returns callMock
every { tokenManagerService.getActiveAccount() } returns mockk()
every { tokenManagerService.isTokenActive(any()) } returns false
every { accountManager.getAuthToken(any(), any(), any(), any<Boolean>(), any(), any()) } returns
mockk()
every { accountManager.peekAuthToken(any(), any()) } returns "auth-token"
every { accountManager.notifyAccountAuthenticated(any()) } returns true
every { accountAuthenticator.getRefreshToken() } returns "refresh-token"
every { accountAuthenticator.updateSession(any()) } returns mockk()

accountAuthenticator.loadRefreshedSessionAccount(mockk())
accountAuthenticator.refreshSessionAuthToken(mockk())
verify { accountAuthenticator.refreshToken(any()) }
}

Expand All @@ -506,7 +511,7 @@ class AccountAuthenticatorTest : RobolectricTest() {
every { accountAuthenticator.refreshToken("refresh-token") } throws
Exception("Failed to refresh token")

accountAuthenticator.loadRefreshedSessionAccount(mockk())
accountAuthenticator.refreshSessionAuthToken(mockk())
verify { accountManager.invalidateAuthToken(any(), any()) }
}
}
2 changes: 1 addition & 1 deletion android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ constructor(
}
is AppMainEvent.RefreshAuthToken -> {
Timber.e("Refreshing token")
accountAuthenticator.loadRefreshedSessionAccount { accountBundleFuture ->
accountAuthenticator.refreshSessionAuthToken { accountBundleFuture ->
val bundle = accountBundleFuture.result
bundle.getParcelable<Intent>(AccountManager.KEY_INTENT).let { intent ->
if (intent == null && bundle.containsKey(AccountManager.KEY_AUTHTOKEN)) {
Expand Down