Simplify network layer (#175)

* Use Ktor for network requests

* Remove V0 version

* Remove Retrofit dependency

* Fix url

* Update versions of dependencies

* Revert kotlinx-datetime

Due to Kotlin/kotlinx-datetime#304

* Rename leftovers

* Remove OkHttp

* Remove unused manifest

* Remove unused Hilt module

* Fix building empty image URLs

* Use OkHttp as engine for Ktor

* Reduce visibility of internal classes

* Fix first set up test

* Store only auth token, not header

* Remove UnitInfo/FoodInfo/VersionInfo/NewShoppingListItemInfo

* Remove RecipeSummaryInfo and ShoppingListsInfo

* Remove FullShoppingListInfo

* Remove ParseRecipeURLInfo

* Remove FullRecipeInfo

* Sign out if access token does not work

* Rename getVersionInfo method

* Update version name

Author: kirmanak

app/build.gradle.kts

@@ -16,8 +16,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "gq.kirmanak.mealient"
-        versionCode = 30
-        versionName = "0.4.1"
+        versionCode = 31
+        versionName = "0.4.2"
         testInstrumentationRunner = "gq.kirmanak.mealient.MealientTestRunner"
         testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
         resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de")
@@ -55,7 +55,7 @@ android {
 
     namespace = "gq.kirmanak.mealient"
 
-    packagingOptions {
+    packaging {
         resources.excludes += "DebugProbesKt.bin"
     }
 

app/src/androidTest/kotlin/gq/kirmanak/mealient/response.VersionResponses.kt

@@ -5,11 +5,15 @@ import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 
-val versionV1Response = MockResponse().setResponseCode(200).setBody(
-    """{"production":true,"version":"v1.0.0beta-5","demoStatus":false,"allowSignup":true}"""
-)
+val versionV1Response = MockResponse()
+    .setResponseCode(200)
+    .setHeader("Content-Type", "application/json")
+    .setBody("""{"production":true,"version":"v1.0.0beta-5","demoStatus":false,"allowSignup":true}""")
 
-val notFoundResponse = MockResponse().setResponseCode(404).setBody("""{"detail":"Not found"}"""")
+val notFoundResponse = MockResponse()
+    .setResponseCode(404)
+    .setHeader("Content-Type", "application/json")
+    .setBody("""{"detail":"Not found"}"""")
 
 fun MockWebServer.dispatch(block: (String, RecordedRequest) -> MockResponse) {
     dispatcher = object : Dispatcher() {

app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt

@@ -9,7 +9,7 @@ interface AuthRepo : ShoppingListsAuthRepo {
 
     suspend fun authenticate(email: String, password: String)
 
-    suspend fun getAuthHeader(): String?
+    suspend fun getAuthToken(): String?
 
     suspend fun logout()
 }

app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt

@@ -4,9 +4,9 @@ import kotlinx.coroutines.flow.Flow
 
 interface AuthStorage {
 
-    val authHeaderFlow: Flow<String?>
+    val authTokenFlow: Flow<String?>
 
-    suspend fun setAuthHeader(authHeader: String?)
+    suspend fun setAuthToken(authToken: String?)
 
-    suspend fun getAuthHeader(): String?
+    suspend fun getAuthToken(): String?
 }

app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt

@@ -1,32 +1,19 @@
 package gq.kirmanak.mealient.data.auth.impl
 
 import gq.kirmanak.mealient.data.auth.AuthDataSource
-import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo
-import gq.kirmanak.mealient.data.baseurl.ServerVersion
-import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0
-import gq.kirmanak.mealient.datasource.v0.models.CreateApiTokenRequestV0
-import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
-import gq.kirmanak.mealient.datasource.v1.models.CreateApiTokenRequestV1
+import gq.kirmanak.mealient.datasource.MealieDataSource
+import gq.kirmanak.mealient.datasource.models.CreateApiTokenRequest
 import javax.inject.Inject
 
 class AuthDataSourceImpl @Inject constructor(
-    private val serverInfoRepo: ServerInfoRepo,
-    private val v0Source: MealieDataSourceV0,
-    private val v1Source: MealieDataSourceV1,
+    private val dataSource: MealieDataSource,
 ) : AuthDataSource {
 
-    private suspend fun getVersion(): ServerVersion = serverInfoRepo.getVersion()
-
-    override suspend fun authenticate(
-        username: String,
-        password: String,
-    ): String = when (getVersion()) {
-        ServerVersion.V0 -> v0Source.authenticate(username, password)
-        ServerVersion.V1 -> v1Source.authenticate(username, password)
+    override suspend fun authenticate(username: String, password: String): String {
+        return dataSource.authenticate(username, password)
     }
 
-    override suspend fun createApiToken(name: String): String = when (getVersion()) {
-        ServerVersion.V0 -> v0Source.createApiToken(CreateApiTokenRequestV0(name)).token
-        ServerVersion.V1 -> v1Source.createApiToken(CreateApiTokenRequestV1(name)).token
+    override suspend fun createApiToken(name: String): String {
+        return dataSource.createApiToken(CreateApiTokenRequest(name)).token
     }
 }

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

@@ -4,6 +4,7 @@ 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.SignOutHandler
 import gq.kirmanak.mealient.logging.Logger
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -13,28 +14,29 @@ class AuthRepoImpl @Inject constructor(
     private val authStorage: AuthStorage,
     private val authDataSource: AuthDataSource,
     private val logger: Logger,
+    private val signOutHandler: SignOutHandler,
 ) : AuthRepo, AuthenticationProvider {
 
     override val isAuthorizedFlow: Flow<Boolean>
-        get() = authStorage.authHeaderFlow.map { it != null }
+        get() = authStorage.authTokenFlow.map { it != null }
 
     override suspend fun authenticate(email: String, password: String) {
         logger.v { "authenticate() called with: email = $email, password = $password" }
         val token = authDataSource.authenticate(email, password)
-        authStorage.setAuthHeader(AUTH_HEADER_FORMAT.format(token))
+        authStorage.setAuthToken(token)
         val apiToken = authDataSource.createApiToken(API_TOKEN_NAME)
-        authStorage.setAuthHeader(AUTH_HEADER_FORMAT.format(apiToken))
+        authStorage.setAuthToken(apiToken)
     }
 
-    override suspend fun getAuthHeader(): String? = authStorage.getAuthHeader()
+    override suspend fun getAuthToken(): String? = authStorage.getAuthToken()
 
     override suspend fun logout() {
         logger.v { "logout() called" }
-        authStorage.setAuthHeader(null)
+        authStorage.setAuthToken(null)
+        signOutHandler.signOut()
     }
 
     companion object {
-        private const val AUTH_HEADER_FORMAT = "Bearer %s"
         private const val API_TOKEN_NAME = "Mealient"
     }
 }

app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt

@@ -22,15 +22,15 @@ class AuthStorageImpl @Inject constructor(
     private val logger: Logger,
 ) : AuthStorage {
 
-    override val authHeaderFlow: Flow<String?>
+    override val authTokenFlow: Flow<String?>
         get() = sharedPreferences
-            .prefsChangeFlow(logger) { getString(AUTH_HEADER_KEY, null) }
+            .prefsChangeFlow(logger) { getString(AUTH_TOKEN_KEY, null) }
             .distinctUntilChanged()
     private val singleThreadDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
 
-    override suspend fun setAuthHeader(authHeader: String?) = putString(AUTH_HEADER_KEY, authHeader)
+    override suspend fun setAuthToken(authToken: String?) = putString(AUTH_TOKEN_KEY, authToken)
 
-    override suspend fun getAuthHeader(): String? = getString(AUTH_HEADER_KEY)
+    override suspend fun getAuthToken(): String? = getString(AUTH_TOKEN_KEY)
 
     private suspend fun putString(
         key: String,
@@ -48,6 +48,6 @@ class AuthStorageImpl @Inject constructor(
 
     companion object {
         @VisibleForTesting
-        const val AUTH_HEADER_KEY = "authHeader"
+        const val AUTH_TOKEN_KEY = "authToken"
     }
 }

app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepo.kt

@@ -1,16 +1,10 @@
 package gq.kirmanak.mealient.data.baseurl
 
-import kotlinx.coroutines.flow.Flow
-
 interface ServerInfoRepo {
 
     suspend fun getUrl(): String?
 
-    suspend fun getVersion(): ServerVersion
-
     suspend fun tryBaseURL(baseURL: String): Result<Unit>
 
-    fun versionUpdates(): Flow<ServerVersion>
-
 }
 

app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt

@@ -1,11 +1,7 @@
 package gq.kirmanak.mealient.data.baseurl
 
 import gq.kirmanak.mealient.datasource.ServerUrlProvider
-import gq.kirmanak.mealient.datasource.runCatchingExceptCancel
 import gq.kirmanak.mealient.logging.Logger
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class ServerInfoRepoImpl @Inject constructor(
@@ -20,47 +16,18 @@ class ServerInfoRepoImpl @Inject constructor(
         return result
     }
 
-    override suspend fun getVersion(): ServerVersion {
-        var version = serverInfoStorage.getServerVersion()
-        val serverVersion = if (version == null) {
-            logger.d { "getVersion: version is null, requesting" }
-            version = versionDataSource.getVersionInfo().version
-            val result = determineServerVersion(version)
-            serverInfoStorage.storeServerVersion(version)
-            result
-        } else {
-            determineServerVersion(version)
-        }
-        logger.v { "getVersion() returned: $serverVersion from $version" }
-        return serverVersion
-    }
-
-    private fun determineServerVersion(version: String): ServerVersion = when {
-        version.startsWith("v0") -> ServerVersion.V0
-        version.startsWith("v1") -> ServerVersion.V1
-        else -> {
-            logger.w { "Unknown server version: $version" }
-            ServerVersion.V1
-        }
-    }
-
     override suspend fun tryBaseURL(baseURL: String): Result<Unit> {
-        val oldVersion = serverInfoStorage.getServerVersion()
         val oldBaseUrl = serverInfoStorage.getBaseURL()
+        serverInfoStorage.storeBaseURL(baseURL)
 
-        return runCatchingExceptCancel {
-            serverInfoStorage.storeBaseURL(baseURL)
-            val version = versionDataSource.getVersionInfo().version
-            serverInfoStorage.storeServerVersion(version)
-        }.onFailure {
-            serverInfoStorage.storeBaseURL(oldBaseUrl, oldVersion)
+        try {
+            versionDataSource.requestVersion()
+        } catch (e: Throwable) {
+            serverInfoStorage.storeBaseURL(oldBaseUrl)
+            return Result.failure(e)
         }
-    }
 
-    override fun versionUpdates(): Flow<ServerVersion> {
-        return serverInfoStorage
-            .serverVersionUpdates()
-            .filterNotNull()
-            .map { determineServerVersion(it) }
+        return Result.success(Unit)
     }
+
 }

app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorage.kt

@@ -1,18 +1,9 @@
 package gq.kirmanak.mealient.data.baseurl
 
-import kotlinx.coroutines.flow.Flow
-
 interface ServerInfoStorage {
 
     suspend fun getBaseURL(): String?
 
-    suspend fun storeBaseURL(baseURL: String)
-
-    suspend fun storeBaseURL(baseURL: String?, version: String?)
-
-    suspend fun storeServerVersion(version: String)
-
-    suspend fun getServerVersion(): String?
+    suspend fun storeBaseURL(baseURL: String?)
 
-    fun serverVersionUpdates(): Flow<String?>
 }

app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerVersion.kt

@@ -1,8 +1,8 @@
 package gq.kirmanak.mealient.data.baseurl
 
-import gq.kirmanak.mealient.datasource.models.VersionInfo
+import gq.kirmanak.mealient.datasource.models.VersionResponse
 
 interface VersionDataSource {
 
-    suspend fun getVersionInfo(): VersionInfo
+    suspend fun requestVersion(): VersionResponse
 }

app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSource.kt

@@ -1,37 +1,14 @@
 package gq.kirmanak.mealient.data.baseurl
 
-import gq.kirmanak.mealient.datasource.models.VersionInfo
-import gq.kirmanak.mealient.datasource.runCatchingExceptCancel
-import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0
-import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
-import gq.kirmanak.mealient.model_mapper.ModelMapper
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
+import gq.kirmanak.mealient.datasource.MealieDataSource
+import gq.kirmanak.mealient.datasource.models.VersionResponse
 import javax.inject.Inject
 
 class VersionDataSourceImpl @Inject constructor(
-    private val v0Source: MealieDataSourceV0,
-    private val v1Source: MealieDataSourceV1,
-    private val modelMapper: ModelMapper,
+    private val dataSource: MealieDataSource,
 ) : VersionDataSource {
 
-    override suspend fun getVersionInfo(): VersionInfo {
-        val responses = coroutineScope {
-            val v0Deferred = async {
-                runCatchingExceptCancel { modelMapper.toVersionInfo(v0Source.getVersionInfo()) }
-            }
-            val v1Deferred = async {
-                runCatchingExceptCancel { modelMapper.toVersionInfo(v1Source.getVersionInfo()) }
-            }
-            listOf(v0Deferred, v1Deferred).awaitAll()
-        }
-        val firstSuccess = responses.firstNotNullOfOrNull { it.getOrNull() }
-        if (firstSuccess == null) {
-            throw responses.firstNotNullOf { it.exceptionOrNull() }
-        } else {
-            return firstSuccess
-        }
+    override suspend fun requestVersion(): VersionResponse {
+        return dataSource.getVersionInfo()
     }
-
 }