chore: refactor interceptors

alvr · May 24, 2024 · fbb9e3d · fbb9e3d
1 parent c6898af
commit fbb9e3d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 28 deletions.
diff --git a/common/session/data/src/commonMain/kotlin/dev/alvr/katana/common/session/data/di/module.kt b/common/session/data/src/commonMain/kotlin/dev/alvr/katana/common/session/data/di/module.kt
@@ -12,11 +12,11 @@ import org.koin.dsl.module
 internal expect fun dataStoreModule(): Module
 
 private val repositoriesModule = module {
-    singleOf(::SessionRepositoryImpl).bind<SessionRepository>()
+    singleOf(::SessionRepositoryImpl) bind SessionRepository::class
 }
 
 private val sourcesModule = module {
-    singleOf(::SessionLocalSourceImpl).bind<SessionLocalSource>()
+    singleOf(::SessionLocalSourceImpl) bind SessionLocalSource::class
 }
 
 val commonSessionDataModule = module {

diff --git a/common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/di/module.kt b/common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/di/module.kt
@@ -13,16 +13,16 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 private val managersModule = module {
-    singleOf(::UserIdManagerImpl).bind<UserIdManager>()
+    singleOf(::UserIdManagerImpl) bind UserIdManager::class
 }
 
 private val repositoriesModule = module {
-    singleOf(::UserRepositoryImpl).bind<UserRepository>()
+    singleOf(::UserRepositoryImpl) bind UserRepository::class
 }
 
 private val sourcesModule = module {
-    singleOf(::UserIdRemoteSourceImpl).bind<UserIdRemoteSource>()
-    singleOf(::UserInfoRemoteSourceImpl).bind<UserInfoRemoteSource>()
+    singleOf(::UserIdRemoteSourceImpl) bind UserIdRemoteSource::class
+    singleOf(::UserInfoRemoteSourceImpl) bind UserInfoRemoteSource::class
 }
 
 val commonUserDataModule = module {

diff --git a/.../preferences/src/androidMain/kotlin/dev/alvr/katana/core/preferences/di/module.android.kt b/.../preferences/src/androidMain/kotlin/dev/alvr/katana/core/preferences/di/module.android.kt
@@ -26,7 +26,7 @@ private val aeadModule = module {
 }
 
 private val securerModule = module {
-    factoryOf(::AndroidPreferencesEncrypt).bind<PreferencesEncrypt>()
+    factoryOf(::AndroidPreferencesEncrypt) bind PreferencesEncrypt::class
 }
 
 internal actual fun encryptionModule() = module {

diff --git a/core/preferences/src/iosMain/kotlin/dev/alvr/katana/core/preferences/di/module.ios.kt b/core/preferences/src/iosMain/kotlin/dev/alvr/katana/core/preferences/di/module.ios.kt
@@ -7,7 +7,7 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 private val securerModule = module {
-    factoryOf(::IosPreferencesEncrypt).bind<PreferencesEncrypt>()
+    factoryOf(::IosPreferencesEncrypt) bind PreferencesEncrypt::class
 }
 
 internal actual fun encryptionModule() = module {

diff --git a/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/di/module.kt b/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/di/module.kt
@@ -7,6 +7,7 @@ import com.apollographql.apollo3.cache.normalized.FetchPolicy
 import com.apollographql.apollo3.cache.normalized.api.CacheKey
 import com.apollographql.apollo3.cache.normalized.api.CacheKeyGenerator
 import com.apollographql.apollo3.cache.normalized.api.CacheKeyGeneratorContext
+import com.apollographql.apollo3.cache.normalized.api.MemoryCacheFactory
 import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
 import com.apollographql.apollo3.cache.normalized.normalizedCache
@@ -28,9 +29,11 @@ import org.koin.dsl.module
 
 internal expect fun ApolloClient.Builder.sentryInterceptor(): ApolloClient.Builder
 
-private val getAnilistTokenInterceptor = named("getAnilistTokenInterceptor")
-private val deleteAnilistTokenInterceptor = named("deleteAnilistTokenInterceptor")
-private val loggingInterceptor = named("loggingInterceptor")
+private enum class Interceptor {
+    GET_TOKEN,
+    DELETE_TOKEN,
+    LOGGING,
+}
 
 private val apolloClientModule = module {
     single {
@@ -50,9 +53,9 @@ private val apolloClientModule = module {
 
         ApolloClient.Builder()
             .serverUrl(ANILIST_BASE_URL)
-            .addHttpInterceptor(get(getAnilistTokenInterceptor))
-            .addHttpInterceptor(get(deleteAnilistTokenInterceptor))
-            .addHttpInterceptor(get(loggingInterceptor))
+            .addHttpInterceptor(get(named(Interceptor.GET_TOKEN)))
+            .addHttpInterceptor(get(named(Interceptor.DELETE_TOKEN)))
+            .addHttpInterceptor(get(named(Interceptor.LOGGING)))
             .sentryInterceptor()
             .fetchPolicy(FetchPolicy.CacheAndNetwork)
             .normalizedCache(
@@ -69,10 +72,10 @@ private val apolloDatabaseModule: Module = module {
 }
 
 private val apolloInterceptorsModule = module {
-    single<HttpInterceptor>(getAnilistTokenInterceptor) {
-        object : HttpInterceptor {
-            val useCase = get<GetAnilistTokenUseCase>()
+    single<HttpInterceptor>(named(Interceptor.GET_TOKEN)) {
+        val useCase = get<GetAnilistTokenUseCase>()
 
+        object : HttpInterceptor {
             override suspend fun intercept(request: HttpRequest, chain: HttpInterceptorChain) =
                 request.newBuilder()
                     .addHeader("Authorization", "Bearer ${useCase().getOrNull()?.token}")
@@ -82,10 +85,10 @@ private val apolloInterceptorsModule = module {
         }
     }
 
-    single<HttpInterceptor>(deleteAnilistTokenInterceptor) {
-        object : HttpInterceptor {
-            val useCase = get<DeleteAnilistTokenUseCase>()
+    single<HttpInterceptor>(named(Interceptor.DELETE_TOKEN)) {
+        val useCase = get<DeleteAnilistTokenUseCase>()
 
+        object : HttpInterceptor {
             override suspend fun intercept(request: HttpRequest, chain: HttpInterceptorChain) =
                 chain.proceed(request).also { response ->
                     if (
@@ -98,7 +101,7 @@ private val apolloInterceptorsModule = module {
         }
     }
 
-    single<HttpInterceptor>(loggingInterceptor) {
+    single<HttpInterceptor>(named(Interceptor.LOGGING)) {
         LoggingInterceptor(
             log = { Logger.i("ApolloLoggingInterceptor") { it } },
             level = if (KatanaBuildConfig.DEBUG) {
@@ -109,7 +112,7 @@ private val apolloInterceptorsModule = module {
         )
     }
 
-    factoryOf(::ReloadInterceptor).bind<ApolloInterceptor>()
+    factoryOf(::ReloadInterceptor) bind ApolloInterceptor::class
 }
 
 val coreRemoteModule = module {

diff --git a/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/extensions.kt b/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/extensions.kt
@@ -4,7 +4,6 @@ import arrow.core.Either
 import com.apollographql.apollo3.api.Optional
 import com.apollographql.apollo3.exception.ApolloHttpException
 import com.apollographql.apollo3.exception.ApolloNetworkException
-import com.apollographql.apollo3.exception.ApolloParseException
 import com.apollographql.apollo3.exception.CacheMissException
 import com.apollographql.apollo3.exception.DefaultApolloException
 import com.apollographql.apollo3.exception.HttpCacheMissException
@@ -26,7 +25,6 @@ fun Throwable.toFailure(
     is DefaultApolloException -> network
     is CacheMissException,
     is HttpCacheMissException -> cache
-    is ApolloParseException,
     is JsonDataException,
     is JsonEncodingException,
     is NoDataException -> response

diff --git a/features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/di/module.kt b/features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/di/module.kt
@@ -13,13 +13,13 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 private val repositoriesModule = module {
-    singleOf(::ListsRepositoryImpl).bind<ListsRepository>()
+    singleOf(::ListsRepositoryImpl) bind ListsRepository::class
 }
 
 private val sourcesModule = module {
-    singleOf(::CommonListsRemoteSourceImpl).bind<CommonListsRemoteSource>()
-    singleOf(::AnimeListsRemoteSourceImpl).bind<AnimeListsRemoteSource>()
-    singleOf(::MangaListsRemoteSourceImpl).bind<MangaListsRemoteSource>()
+    singleOf(::CommonListsRemoteSourceImpl) bind CommonListsRemoteSource::class
+    singleOf(::AnimeListsRemoteSourceImpl) bind AnimeListsRemoteSource::class
+    singleOf(::MangaListsRemoteSourceImpl) bind MangaListsRemoteSource::class
 }
 
 val featuresListsDataModule = module {