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

Implement logout feature

Browse Source
This commit is contained in:
Kirill Kamakin
2021-11-14 11:51:31 +03:00
parent 670dcbccc8
commit 7e1576e8f6
9 changed files with 91 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/gq/kirmanak/mealie/MainActivity.kt
View File

@@ -2,6 +2,7 @@ package gq.kirmanak.mealie
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
@@ -48,4 +49,15 @@ class MainActivity : AppCompatActivity() {
menu.findItem(R.id.logout).isVisible = isAuthenticated
return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
Timber.v("onOptionsItemSelected() called with: item = $item")
val result = if (item.itemId == R.id.logout) {
authViewModel.logout()
true
} else {
super.onOptionsItemSelected(item)
}
return result
}
}

2
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepo.kt
View File

@@ -10,4 +10,6 @@ interface AuthRepo {
suspend fun getToken(): String?
fun authenticationStatuses(): Flow<Boolean>
fun logout()
}

4
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt
View File

@@ -3,11 +3,13 @@ package gq.kirmanak.mealie.data.auth
import kotlinx.coroutines.flow.Flow
interface AuthStorage {
suspend fun storeAuthData(token: String, baseUrl: String)
fun storeAuthData(token: String, baseUrl: String)
suspend fun getBaseUrl(): String?
suspend fun getToken(): String?
fun tokenObservable(): Flow<String?>
fun clearAuthData()
}

5
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt
View File

@@ -38,4 +38,9 @@ class AuthRepoImpl @Inject constructor(
Timber.v("authenticationStatuses() called")
return storage.tokenObservable().map { it != null }
}
override fun logout() {
Timber.v("logout() called")
storage.clearAuthData()
}
}

14
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt
View File

@@ -25,7 +25,7 @@ class AuthStorageImpl @Inject constructor(@ApplicationContext private val contex
private val sharedPreferences: SharedPreferences
get() = PreferenceManager.getDefaultSharedPreferences(context)
override suspend fun storeAuthData(token: String, baseUrl: String) {
override fun storeAuthData(token: String, baseUrl: String) {
Timber.v("storeAuthData() called with: token = $token, baseUrl = $baseUrl")
sharedPreferences.edit()
.putString(TOKEN_KEY, token)
@@ -47,6 +47,10 @@ class AuthStorageImpl @Inject constructor(@ApplicationContext private val contex
return token
}
private suspend fun getString(key: String): String? = withContext(Dispatchers.Default) {
sharedPreferences.getString(key, null)
}
override fun tokenObservable(): Flow<String?> {
Timber.v("tokenObservable() called")
return callbackFlow {
@@ -70,7 +74,11 @@ class AuthStorageImpl @Inject constructor(@ApplicationContext private val contex
}
}
private suspend fun getString(key: String): String? = withContext(Dispatchers.Default) {
sharedPreferences.getString(key, null)
override fun clearAuthData() {
Timber.v("clearAuthData() called")
sharedPreferences.edit()
.remove(TOKEN_KEY)
.remove(BASE_URL_KEY)
.apply()
}
}

5
app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt
View File

@@ -24,4 +24,9 @@ class AuthenticationViewModel @Inject constructor(
Timber.v("authenticationStatuses() called")
return authRepo.authenticationStatuses()
}
fun logout() {
Timber.v("logout() called")
authRepo.logout()
}
}

27
app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesFragment.kt
View File

@@ -7,9 +7,11 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import dagger.hilt.android.AndroidEntryPoint
import gq.kirmanak.mealie.databinding.FragmentRecipesBinding
import gq.kirmanak.mealie.ui.auth.AuthenticationViewModel
import kotlinx.coroutines.flow.collectLatest
import timber.log.Timber
@@ -19,6 +21,7 @@ class RecipesFragment : Fragment() {
private val binding: FragmentRecipesBinding
get() = checkNotNull(_binding) { "Binding requested when fragment is off screen" }
private val viewModel by viewModels<RecipeViewModel>()
private val authViewModel by viewModels<AuthenticationViewModel>()
override fun onCreateView(
inflater: LayoutInflater,
@@ -33,13 +36,33 @@ class RecipesFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
Timber.v("onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState")
setupRecipeAdapter()
listenToAuthStatuses()
}
private fun listenToAuthStatuses() {
Timber.v("listenToAuthStatuses() called")
lifecycleScope.launchWhenCreated {
authViewModel.authenticationStatuses().collectLatest {
Timber.v("listenToAuthStatuses: new auth status = $it")
if (!it) navigateToAuthFragment()
}
}
}
private fun navigateToAuthFragment() {
Timber.v("navigateToAuthFragment() called")
findNavController().navigate(RecipesFragmentDirections.actionRecipesFragmentToAuthenticationFragment())
}
private fun setupRecipeAdapter() {
Timber.v("setupRecipeAdapter() called")
binding.recipes.layoutManager = LinearLayoutManager(requireContext())
val recipesPagingAdapter = RecipesPagingAdapter(viewModel)
binding.recipes.adapter = recipesPagingAdapter
lifecycleScope.launchWhenResumed {
Timber.d("onViewCreated: coroutine started")
viewModel.recipeFlow.collectLatest {
Timber.d("onViewCreated: received update")
Timber.d("setupRecipeAdapter: received update")
recipesPagingAdapter.submitData(it)
}
}

8
app/src/main/res/navigation/nav_graph.xml
View File

@@ -19,5 +19,11 @@
android:id="@+id/recipesFragment"
android:name="gq.kirmanak.mealie.ui.recipes.RecipesFragment"
android:label="fragment_recipes"
tools:layout="@layout/fragment_recipes" />
tools:layout="@layout/fragment_recipes">
<action
android:id="@+id/action_recipesFragment_to_authenticationFragment"
app:destination="@id/authenticationFragment"
app:popUpTo="@id/nav_graph"
app:popUpToInclusive="true" />
</fragment>
</navigation>

21
app/src/test/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImplTest.kt
View File

@@ -53,4 +53,25 @@ class AuthStorageImplTest : HiltRobolectricTest() {
subject.storeAuthData(TEST_TOKEN, TEST_URL)
assertThat(subject.tokenObservable().first()).isEqualTo(TEST_TOKEN)
}
@Test
fun `when clearAuthData then first token is null`() = runBlocking {
subject.storeAuthData(TEST_TOKEN, TEST_URL)
subject.clearAuthData()
assertThat(subject.tokenObservable().first()).isNull()
}
@Test
fun `when clearAuthData then getToken returns null`() = runBlocking {
subject.storeAuthData(TEST_TOKEN, TEST_URL)
subject.clearAuthData()
assertThat(subject.getToken()).isNull()
}
@Test
fun `when clearAuthData then getBaseUrl returns null`() = runBlocking {
subject.storeAuthData(TEST_TOKEN, TEST_URL)
subject.clearAuthData()
assertThat(subject.getBaseUrl()).isNull()
}
}