Skip to content
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

Jump to bottom

[MWCore] Update refresh token to avoid reuse of stale refresh token #2959

Merged
merged 1 commit into from
Jan 11, 2024
Merged

[MWCore] Update refresh token to avoid reuse of stale refresh token #2959

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
2 changes: 1 addition & 1 deletion 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 @@ -83,7 +83,7 @@ constructor(
if (!refreshToken.isNullOrEmpty()) {
authToken =
try {
tokenAuthenticator.refreshToken(refreshToken)
tokenAuthenticator.refreshToken(account, refreshToken)
} catch (ex: Exception) {
Timber.e(ex)
"" // Set to EMPTY, so as to redirect to log in screen, and try again
Expand Down
5 changes: 4 additions & 1 deletion .../src/main/java/org/smartregister/fhircore/engine/data/remote/shared/TokenAuthenticator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,16 @@ constructor(
* [HttpException] or [UnknownHostException] exceptions
*/
@Throws(HttpException::class, UnknownHostException::class)
fun refreshToken(currentRefreshToken: String): String {
fun refreshToken(account: Account, currentRefreshToken: String): String {
return runBlocking {
val oAuthResponse =
oAuthService.fetchToken(
buildOAuthPayload(REFRESH_TOKEN).apply { put(REFRESH_TOKEN, currentRefreshToken) }
)

// Updates with new refresh-token
accountManager.setPassword(account, oAuthResponse.refreshToken!!)

// Returns valid token or throws exception, NullPointerException not expected
oAuthResponse.accessToken!!
}
Expand Down
12 changes: 7 additions & 5 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 @@ -253,8 +253,9 @@ class AccountAuthenticatorTest : RobolectricTest() {
every { accountManager.peekAuthToken(account, authTokenType) } returns ""
val refreshToken = "refreshToken"
every { accountManager.getPassword(account) } returns refreshToken
every { accountManager.setPassword(account, any()) } just runs

every { tokenAuthenticator.refreshToken(refreshToken) } returns ""
every { tokenAuthenticator.refreshToken(account, refreshToken) } returns ""

val authToken = accountAuthenticator.getAuthToken(mockk(), account, authTokenType, bundleOf())
val parcelable = authToken.get(AccountManager.KEY_INTENT) as Intent
Expand All @@ -273,7 +274,8 @@ class AccountAuthenticatorTest : RobolectricTest() {

val refreshToken = "refreshToken"
every { accountManager.getPassword(account) } returns refreshToken
every { tokenAuthenticator.refreshToken(refreshToken) } returns "newAccessToken"
every { accountManager.setPassword(account, any()) } just runs
every { tokenAuthenticator.refreshToken(account, refreshToken) } returns "newAccessToken"

val authTokenBundle: Bundle =
accountAuthenticator.getAuthToken(null, account, authTokenType, bundleOf())
Expand All @@ -291,7 +293,7 @@ class AccountAuthenticatorTest : RobolectricTest() {

val refreshToken = "refreshToken"
every { accountManager.getPassword(account) } returns refreshToken
every { tokenAuthenticator.refreshToken(refreshToken) } throws
every { tokenAuthenticator.refreshToken(account, refreshToken) } throws
HttpException(
mockk {
every { code() } returns 0
Expand All @@ -314,7 +316,7 @@ class AccountAuthenticatorTest : RobolectricTest() {

val refreshToken = "refreshToken"
every { accountManager.getPassword(account) } returns refreshToken
every { tokenAuthenticator.refreshToken(refreshToken) } throws UnknownHostException()
every { tokenAuthenticator.refreshToken(account, refreshToken) } throws UnknownHostException()

val authTokenBundle: Bundle =
accountAuthenticator.getAuthToken(null, account, authTokenType, bundleOf())
Expand All @@ -330,7 +332,7 @@ class AccountAuthenticatorTest : RobolectricTest() {

val refreshToken = "refreshToken"
every { accountManager.getPassword(account) } returns refreshToken
every { tokenAuthenticator.refreshToken(refreshToken) } throws RuntimeException()
every { tokenAuthenticator.refreshToken(account, refreshToken) } throws RuntimeException()

val authTokenBundle =
accountAuthenticator.getAuthToken(null, account, authTokenType, bundleOf())
Expand Down
6 changes: 5 additions & 1 deletion ...oid/engine/src/test/java/org/smartregister/fhircore/engine/auth/TokenAuthenticatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import io.mockk.mockk
import io.mockk.runs
import io.mockk.slot
import io.mockk.spyk
import io.mockk.verify
import io.mockk.verifyOrder
import java.io.IOException
import java.net.UnknownHostException
Expand Down Expand Up @@ -388,6 +389,7 @@ class TokenAuthenticatorTest : RobolectricTest() {

@Test
fun testRefreshTokenShouldReturnToken() {
val account = Account(sampleUsername, PROVIDER)
val accessToken = "soRefreshingNewToken"
val oAuthResponse =
OAuthResponse(
Expand All @@ -398,11 +400,13 @@ class TokenAuthenticatorTest : RobolectricTest() {
scope = SCOPE
)
coEvery { oAuthService.fetchToken(any()) } returns oAuthResponse
every { accountManager.setPassword(account, any()) } just runs

val currentRefreshToken = "oldRefreshToken"
val newAccessToken = tokenAuthenticator.refreshToken(currentRefreshToken)
val newAccessToken = tokenAuthenticator.refreshToken(account, currentRefreshToken)
Assert.assertNotNull(newAccessToken)
Assert.assertEquals(accessToken, newAccessToken)
verify { accountManager.setPassword(eq(account), oAuthResponse.refreshToken) }
}

@OptIn(ExperimentalCoroutinesApi::class)
Expand Down
Loading