From f5ee40d945f8dce6054c8df201db8874268343f9 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sun, 7 Nov 2021 18:29:37 +0300 Subject: [PATCH] Store base url too --- .../java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt | 2 +- .../java/gq/kirmanak/mealie/data/auth/AuthStorage.kt | 2 +- .../gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt index 8f0a383..cc53efe 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt @@ -24,7 +24,7 @@ class AuthRepoImpl @Inject constructor( Timber.d("authenticate result is $authResult") if (authResult.isFailure) return authResult.exceptionOrNull() val token = checkNotNull(authResult.getOrNull()) - storage.storeToken(token) + storage.storeAuthData(token, baseUrl) return null } } \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt index 4375fb8..84da405 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt @@ -2,5 +2,5 @@ package gq.kirmanak.mealie.data.auth interface AuthStorage { suspend fun isAuthenticated(): Boolean - suspend fun storeToken(token: String) + suspend fun storeAuthData(token: String, baseUrl: String) } \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt index 2b51fdc..5b03982 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt @@ -10,6 +10,7 @@ import timber.log.Timber import javax.inject.Inject private const val TOKEN_KEY = "AUTH_TOKEN" +private const val BASE_URL_KEY = "BASE_URL" class AuthStorageImpl @Inject constructor(@ApplicationContext private val context: Context) : AuthStorage { private val sharedPreferences: SharedPreferences @@ -22,8 +23,11 @@ class AuthStorageImpl @Inject constructor(@ApplicationContext private val contex token != null } - override suspend fun storeToken(token: String) { - Timber.d("storeToken() called with: token = $token") - sharedPreferences.edit().putString(TOKEN_KEY, token).apply() + override suspend fun storeAuthData(token: String, baseUrl: String) { + Timber.v("storeAuthData() called with: token = $token, baseUrl = $baseUrl") + sharedPreferences.edit() + .putString(TOKEN_KEY, token) + .putString(BASE_URL_KEY, baseUrl) + .apply() } } \ No newline at end of file