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

#162 change TokenProvider to fun interface #190

Merged
merged 1 commit into from
Jan 15, 2023
Merged

#162 change TokenProvider to fun interface #190

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 network/src/commonMain/kotlin/dev/icerock/moko/network/plugins/TokenPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TokenPlugin private constructor(
}
}

interface TokenProvider {
fun interface TokenProvider {
fun getToken(): String?
}
}
17 changes: 6 additions & 11 deletions network/src/commonTest/kotlin/RefreshTokenPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ class RefreshTokenPluginTest {
val validToken = "124"
val tokenHolder = MutableStateFlow<String?>(invalidToken)
val client = createMockClient(
tokenProvider = object : TokenPlugin.TokenProvider {
override fun getToken(): String? {
return tokenHolder.value
}
},
tokenProvider = { tokenHolder.value },
pluginConfig = {
this.updateTokenHandler = {
tokenHolder.value = validToken
Expand All @@ -62,13 +58,12 @@ class RefreshTokenPluginTest {
this.isCredentialsActual = { request ->
request.headers[AUTH_HEADER_NAME] == tokenHolder.value
}
},
handler = { request ->
if (request.headers[AUTH_HEADER_NAME] == invalidToken) {
respondError(status = HttpStatusCode.Unauthorized)
} else respondOk()
}
)
) { request ->
if (request.headers[AUTH_HEADER_NAME] == invalidToken) {
respondError(status = HttpStatusCode.Unauthorized)
} else respondOk()
}

val result = runBlocking {
client.get("localhost")
Expand Down
30 changes: 10 additions & 20 deletions network/src/commonTest/kotlin/TokenFeatureTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,11 @@ class TokenFeatureTest {
@Test
fun `token added when exist`() {
val client = createMockClient(
tokenProvider = object : TokenPlugin.TokenProvider {
override fun getToken(): String {
return "mytoken"
}
},
handler = { request ->
if (request.headers[AUTH_HEADER_NAME] == "mytoken") respondOk()
else respondBadRequest()
}
)
tokenProvider = { "mytoken" }
) { request ->
if (request.headers[AUTH_HEADER_NAME] == "mytoken") respondOk()
else respondBadRequest()
}

val result = runBlocking {
client.get("localhost")
Expand All @@ -39,16 +34,11 @@ class TokenFeatureTest {
@Test
fun `token not added when not exist`() {
val client = createMockClient(
tokenProvider = object : TokenPlugin.TokenProvider {
override fun getToken(): String? {
return null
}
},
handler = { request ->
if (request.headers.contains(AUTH_HEADER_NAME).not()) respondOk()
else respondBadRequest()
}
)
tokenProvider = { null }
) { request ->
if (request.headers.contains(AUTH_HEADER_NAME).not()) respondOk()
else respondBadRequest()
}

val result = runBlocking {
client.get("localhost")
Expand Down
4 changes: 2 additions & 2 deletions sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/TestViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class TestViewModel : ViewModel() {

install(TokenPlugin) {
tokenHeaderName = "Authorization"
tokenProvider = object : TokenPlugin.TokenProvider {
override fun getToken(): String = "ed155d0a445e4b4fbd878fe1f3bc1b7f"
tokenProvider = TokenPlugin.TokenProvider {
"ed155d0a445e4b4fbd878fe1f3bc1b7f"
}
}
}
Expand Down