atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Extract Authorization header to an interceptor

Browse Source
This commit is contained in:
Kirill Kamakin
2022-12-10 08:15:46 +01:00
parent 915fd77daa
commit 54d0c895a9
14 changed files with 103 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt
View File

@@ -3,6 +3,7 @@ package gq.kirmanak.mealient.data.auth.impl
import gq.kirmanak.mealient.data.auth.AuthDataSource
import gq.kirmanak.mealient.data.auth.AuthRepo
import gq.kirmanak.mealient.data.auth.AuthStorage
import gq.kirmanak.mealient.datasource.AuthenticationProvider
import gq.kirmanak.mealient.datasource.runCatchingExceptCancel
import gq.kirmanak.mealient.logging.Logger
import kotlinx.coroutines.flow.Flow
@@ -15,7 +16,7 @@ class AuthRepoImpl @Inject constructor(
private val authStorage: AuthStorage,
private val authDataSource: AuthDataSource,
private val logger: Logger,
) : AuthRepo {
) : AuthRepo, AuthenticationProvider {
override val isAuthorizedFlow: Flow<Boolean>
get() = authStorage.authHeaderFlow.map { it != null }

32
app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt
View File

@@ -35,12 +35,12 @@ class MealieDataSourceWrapper @Inject constructor(
override suspend fun addRecipe(
recipe: AddRecipeInfo,
): String = makeCall { token, url, version ->
): String = makeCall { url, version ->
when (version) {
ServerVersion.V0 -> v0Source.addRecipe(url, token, recipe.toV0Request())
ServerVersion.V0 -> v0Source.addRecipe(url, recipe.toV0Request())
ServerVersion.V1 -> {
val slug = v1Source.createRecipe(url, token, recipe.toV1CreateRequest())
v1Source.updateRecipe(url, token, slug, recipe.toV1UpdateRequest())
val slug = v1Source.createRecipe(url, recipe.toV1CreateRequest())
v1Source.updateRecipe(url, slug, recipe.toV1UpdateRequest())
slug
}
}
@@ -49,53 +49,53 @@ class MealieDataSourceWrapper @Inject constructor(
override suspend fun requestRecipes(
start: Int,
limit: Int,
): List<RecipeSummaryInfo> = makeCall { token, url, version ->
): List<RecipeSummaryInfo> = makeCall { url, version ->
when (version) {
ServerVersion.V0 -> {
v0Source.requestRecipes(url, token, start, limit).map { it.toRecipeSummaryInfo() }
v0Source.requestRecipes(url, start, limit).map { it.toRecipeSummaryInfo() }
}
ServerVersion.V1 -> {
// Imagine start is 30 and limit is 15. It means that we already have page 1 and 2, now we need page 3
val page = start / limit + 1
v1Source.requestRecipes(url, token, page, limit).map { it.toRecipeSummaryInfo() }
v1Source.requestRecipes(url, page, limit).map { it.toRecipeSummaryInfo() }
}
}
}
override suspend fun requestRecipeInfo(
slug: String,
): FullRecipeInfo = makeCall { token, url, version ->
): FullRecipeInfo = makeCall { url, version ->
when (version) {
ServerVersion.V0 -> v0Source.requestRecipeInfo(url, token, slug).toFullRecipeInfo()
ServerVersion.V1 -> v1Source.requestRecipeInfo(url, token, slug).toFullRecipeInfo()
ServerVersion.V0 -> v0Source.requestRecipeInfo(url, slug).toFullRecipeInfo()
ServerVersion.V1 -> v1Source.requestRecipeInfo(url, slug).toFullRecipeInfo()
}
}
override suspend fun parseRecipeFromURL(
parseRecipeURLInfo: ParseRecipeURLInfo,
): String = makeCall { token, url, version ->
): String = makeCall { url, version ->
when (version) {
ServerVersion.V0 -> {
v0Source.parseRecipeFromURL(url, token, parseRecipeURLInfo.toV0Request())
v0Source.parseRecipeFromURL(url, parseRecipeURLInfo.toV0Request())
}
ServerVersion.V1 -> {
v1Source.parseRecipeFromURL(url, token, parseRecipeURLInfo.toV1Request())
v1Source.parseRecipeFromURL(url, parseRecipeURLInfo.toV1Request())
}
}
}
private suspend inline fun <T> makeCall(block: (String?, String, ServerVersion) -> T): T {
private suspend inline fun <T> makeCall(block: (String, ServerVersion) -> T): T {
val authHeader = authRepo.getAuthHeader()
val url = serverInfoRepo.requireUrl()
val version = serverInfoRepo.getVersion()
return runCatchingExceptCancel { block(authHeader, url, version) }.getOrElse {
return runCatchingExceptCancel { block(url, version) }.getOrElse {
if (it is NetworkError.Unauthorized) {
logger.e { "Unauthorized, trying to invalidate token" }
authRepo.invalidateAuthHeader()
// Trying again with new authentication header
val newHeader = authRepo.getAuthHeader()
logger.e { "New token ${if (newHeader == authHeader) "matches" else "doesn't match"} old token" }
if (newHeader == authHeader) throw it else block(newHeader, url, version)
if (newHeader == authHeader) throw it else block(url, version)
} else {
throw it
}

5
app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt
View File

@@ -14,6 +14,7 @@ import gq.kirmanak.mealient.data.auth.AuthStorage
import gq.kirmanak.mealient.data.auth.impl.AuthDataSourceImpl
import gq.kirmanak.mealient.data.auth.impl.AuthRepoImpl
import gq.kirmanak.mealient.data.auth.impl.AuthStorageImpl
import gq.kirmanak.mealient.datasource.AuthenticationProvider
import javax.inject.Singleton
@Module
@@ -37,6 +38,10 @@ interface AuthModule {
@Singleton
fun bindAuthRepo(authRepo: AuthRepoImpl): AuthRepo
@Binds
@Singleton
fun bindAuthProvider(authRepo: AuthRepoImpl): AuthenticationProvider
@Binds
@Singleton
fun bindAuthStorage(authStorageImpl: AuthStorageImpl): AuthStorage

26
app/src/main/java/gq/kirmanak/mealient/ui/recipes/images/RecipeModelLoader.kt
View File

@@ -1,12 +1,12 @@
package gq.kirmanak.mealient.ui.recipes.images
import com.bumptech.glide.load.Options
import com.bumptech.glide.load.model.*
import com.bumptech.glide.load.model.GlideUrl
import com.bumptech.glide.load.model.ModelCache
import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.stream.BaseGlideUrlLoader
import gq.kirmanak.mealient.data.auth.AuthRepo
import gq.kirmanak.mealient.data.recipes.impl.RecipeImageUrlProvider
import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
import gq.kirmanak.mealient.datasource.DataSourceModule.Companion.AUTHORIZATION_HEADER_NAME
import gq.kirmanak.mealient.logging.Logger
import kotlinx.coroutines.runBlocking
import java.io.InputStream
@@ -16,7 +16,6 @@ import javax.inject.Singleton
class RecipeModelLoader private constructor(
private val recipeImageUrlProvider: RecipeImageUrlProvider,
private val logger: Logger,
private val authRepo: AuthRepo,
concreteLoader: ModelLoader<GlideUrl, InputStream>,
cache: ModelCache<RecipeSummaryEntity, GlideUrl>,
) : BaseGlideUrlLoader<RecipeSummaryEntity>(concreteLoader, cache) {
@@ -25,13 +24,12 @@ class RecipeModelLoader private constructor(
class Factory @Inject constructor(
private val recipeImageUrlProvider: RecipeImageUrlProvider,
private val logger: Logger,
private val authRepo: AuthRepo,
) {
fun build(
concreteLoader: ModelLoader<GlideUrl, InputStream>,
cache: ModelCache<RecipeSummaryEntity, GlideUrl>,
) = RecipeModelLoader(recipeImageUrlProvider, logger, authRepo, concreteLoader, cache)
) = RecipeModelLoader(recipeImageUrlProvider, logger, concreteLoader, cache)
}
@@ -46,20 +44,4 @@ class RecipeModelLoader private constructor(
logger.v { "getUrl() called with: model = $model, width = $width, height = $height, options = $options" }
return runBlocking { recipeImageUrlProvider.generateImageUrl(model?.imageId) }
}
override fun getHeaders(
model: RecipeSummaryEntity?,
width: Int,
height: Int,
options: Options?
): Headers? {
val authorization = runBlocking { authRepo.getAuthHeader() }
return if (authorization.isNullOrBlank()) {
super.getHeaders(model, width, height, options)
} else {
LazyHeaders.Builder()
.setHeader(AUTHORIZATION_HEADER_NAME, authorization)
.build()
}
}
}

30
app/src/test/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapperTest.kt
View File

@@ -57,11 +57,8 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
fun `when makeCall fails with Unauthorized expect it to invalidate token`() = runTest {
val slug = "porridge"
coEvery {
v0Source.requestRecipeInfo(any(), isNull(), any())
} throws NetworkError.Unauthorized(IOException())
coEvery {
v0Source.requestRecipeInfo(any(), eq(TEST_AUTH_HEADER), any())
} returns PORRIDGE_RECIPE_RESPONSE_V0
v0Source.requestRecipeInfo(any(), any())
} throws NetworkError.Unauthorized(IOException()) andThen PORRIDGE_RECIPE_RESPONSE_V0
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V0
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
coEvery { authRepo.getAuthHeader() } returns null andThen TEST_AUTH_HEADER
@@ -79,7 +76,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
fun `when server version v1 expect requestRecipeInfo to call v1`() = runTest {
val slug = "porridge"
coEvery {
v1Source.requestRecipeInfo(eq(TEST_BASE_URL), eq(TEST_AUTH_HEADER), eq(slug))
v1Source.requestRecipeInfo(eq(TEST_BASE_URL), eq(slug))
} returns PORRIDGE_RECIPE_RESPONSE_V1
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V1
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
@@ -87,7 +84,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
val actual = subject.requestRecipeInfo(slug)
coVerify { v1Source.requestRecipeInfo(eq(TEST_BASE_URL), eq(TEST_AUTH_HEADER), eq(slug)) }
coVerify { v1Source.requestRecipeInfo(eq(TEST_BASE_URL), eq(slug)) }
assertThat(actual).isEqualTo(PORRIDGE_FULL_RECIPE_INFO)
}
@@ -95,7 +92,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
@Test
fun `when server version v1 expect requestRecipes to call v1`() = runTest {
coEvery {
v1Source.requestRecipes(any(), any(), any(), any())
v1Source.requestRecipes(any(), any(), any())
} returns listOf(PORRIDGE_RECIPE_SUMMARY_RESPONSE_V1)
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V1
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
@@ -106,7 +103,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
val page = 5 // 0-9 (1), 10-19 (2), 20-29 (3), 30-39 (4), 40-49 (5)
val perPage = 10
coVerify {
v1Source.requestRecipes(eq(TEST_BASE_URL), eq(TEST_AUTH_HEADER), eq(page), eq(perPage))
v1Source.requestRecipes(eq(TEST_BASE_URL), eq(page), eq(perPage))
}
assertThat(actual).isEqualTo(listOf(RECIPE_SUMMARY_PORRIDGE_V1))
@@ -115,7 +112,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
@Test
fun `when server version v0 expect requestRecipes to call v0`() = runTest {
coEvery {
v0Source.requestRecipes(any(), any(), any(), any())
v0Source.requestRecipes(any(), any(), any())
} returns listOf(PORRIDGE_RECIPE_SUMMARY_RESPONSE_V0)
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V0
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
@@ -126,7 +123,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
val actual = subject.requestRecipes(start, limit)
coVerify {
v0Source.requestRecipes(eq(TEST_BASE_URL), eq(TEST_AUTH_HEADER), eq(start), eq(limit))
v0Source.requestRecipes(eq(TEST_BASE_URL), eq(start), eq(limit))
}
assertThat(actual).isEqualTo(listOf(RECIPE_SUMMARY_PORRIDGE_V0))
@@ -134,7 +131,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
@Test(expected = IOException::class)
fun `when request fails expect addRecipe to rethrow`() = runTest {
coEvery { v0Source.addRecipe(any(), any(), any()) } throws IOException()
coEvery { v0Source.addRecipe(any(), any()) } throws IOException()
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V0
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
coEvery { authRepo.getAuthHeader() } returns TEST_AUTH_HEADER
@@ -145,7 +142,7 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
fun `when server version v0 expect addRecipe to call v0`() = runTest {
val slug = "porridge"
coEvery { v0Source.addRecipe(any(), any(), any()) } returns slug
coEvery { v0Source.addRecipe(any(), any()) } returns slug
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V0
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
coEvery { authRepo.getAuthHeader() } returns TEST_AUTH_HEADER
@@ -155,7 +152,6 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
coVerify {
v0Source.addRecipe(
eq(TEST_BASE_URL),
eq(TEST_AUTH_HEADER),
eq(PORRIDGE_ADD_RECIPE_REQUEST_V0),
)
}
@@ -167,9 +163,9 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
fun `when server version v1 expect addRecipe to call v1`() = runTest {
val slug = "porridge"
coEvery { v1Source.createRecipe(any(), any(), any()) } returns slug
coEvery { v1Source.createRecipe(any(), any()) } returns slug
coEvery {
v1Source.updateRecipe(any(), any(), any(), any())
v1Source.updateRecipe(any(), any(), any())
} returns PORRIDGE_RECIPE_RESPONSE_V1
coEvery { serverInfoRepo.getVersion() } returns TEST_SERVER_VERSION_V1
coEvery { serverInfoRepo.requireUrl() } returns TEST_BASE_URL
@@ -180,13 +176,11 @@ class MealieDataSourceWrapperTest : BaseUnitTest() {
coVerifySequence {
v1Source.createRecipe(
eq(TEST_BASE_URL),
eq(TEST_AUTH_HEADER),
eq(PORRIDGE_CREATE_RECIPE_REQUEST_V1),
)
v1Source.updateRecipe(
eq(TEST_BASE_URL),
eq(TEST_AUTH_HEADER),
eq(slug),
eq(PORRIDGE_UPDATE_RECIPE_REQUEST_V1),
)