Feat/Logout

app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndCreateEvent.kt

@@ -3,6 +3,7 @@ package com.android.streetworkapp.end2end
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertTextContains
 import androidx.compose.ui.test.click
@@ -38,14 +39,17 @@ import com.android.streetworkapp.model.user.UserRepository
 import com.android.streetworkapp.model.user.UserViewModel
 import com.android.streetworkapp.model.workout.WorkoutViewModel
 import com.android.streetworkapp.ui.navigation.Screen
+import com.android.streetworkapp.utils.GoogleAuthService
 import com.google.firebase.Timestamp
+import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mockito.RETURNS_DEFAULTS
 import org.mockito.Mockito.mock
 
 @RunWith(AndroidJUnit4::class)
@@ -139,6 +143,10 @@ class End2EndCreateEvent {
           mock(TextModerationViewModel::class.java),
           mock(ImageViewModel::class.java),
           mock(PreferencesViewModel::class.java),
+          GoogleAuthService(
+              "abc",
+              mock(FirebaseAuth::class.java, RETURNS_DEFAULTS),
+              context = LocalContext.current),
           true)
     }
   }

app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndGeneral.kt

@@ -1,5 +1,6 @@
 package com.android.streetworkapp.end2end
 
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertTextEquals
@@ -32,11 +33,14 @@ import com.android.streetworkapp.model.user.UserViewModel
 import com.android.streetworkapp.model.workout.WorkoutRepository
 import com.android.streetworkapp.model.workout.WorkoutViewModel
 import com.android.streetworkapp.ui.navigation.Route
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.FirebaseAuth
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.InjectMocks
 import org.mockito.Mock
+import org.mockito.Mockito.RETURNS_DEFAULTS
 import org.mockito.Mockito.mock
 import org.mockito.MockitoAnnotations
 import org.mockito.kotlin.wheneverBlocking
@@ -124,7 +128,9 @@ class End2EndGeneral {
           WorkoutViewModel(mock(WorkoutRepository::class.java)),
           TextModerationViewModel(mock(TextModerationRepository::class.java)),
           ImageViewModel(mock(ImageRepository::class.java)),
-          PreferencesViewModel(mock(PreferencesRepository::class.java)))
+          PreferencesViewModel(mock(PreferencesRepository::class.java)),
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current))
     }
 
     composeTestRule.waitForIdle()

app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.click
@@ -42,6 +43,8 @@ import com.android.streetworkapp.model.progression.ProgressionViewModel
 import com.android.streetworkapp.model.user.UserViewModel
 import com.android.streetworkapp.model.workout.WorkoutViewModel
 import com.android.streetworkapp.ui.navigation.Route
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.FirebaseAuth
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.After
@@ -51,6 +54,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.any
+import org.mockito.Mockito.RETURNS_DEFAULTS
 import org.mockito.Mockito.mock
 
 @RunWith(AndroidJUnit4::class)
@@ -118,7 +122,9 @@ class End2EndParks {
           WorkoutViewModel(mockk()),
           TextModerationViewModel(mockk()),
           ImageViewModel(mockk()),
-          PreferencesViewModel(mock(PreferencesRepository::class.java)))
+          PreferencesViewModel(mock(PreferencesRepository::class.java)),
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current))
       // setup so as we're already on the MAP route
     }
 

app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndWorkoutTraining.kt

@@ -1,5 +1,6 @@
 package com.android.streetworkapp.end2end
 
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertTextEquals
@@ -36,6 +37,8 @@ import com.android.streetworkapp.model.workout.WorkoutSession
 import com.android.streetworkapp.model.workout.WorkoutViewModel
 import com.android.streetworkapp.ui.navigation.NavigationActions
 import com.android.streetworkapp.ui.navigation.Route
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.FirebaseAuth
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
@@ -122,7 +125,8 @@ class End2EndWorkoutTraining {
           workoutViewModel,
           TextModerationViewModel(mock(TextModerationRepository::class.java)),
           mock(ImageViewModel::class.java),
-          PreferencesViewModel(mock(PreferencesRepository::class.java)))
+          PreferencesViewModel(mock(PreferencesRepository::class.java)),
+          GoogleAuthService("abc", mock(FirebaseAuth::class.java), LocalContext.current))
     }
     NavigationActions(testNavController).apply {
       composeTestRule.waitForIdle()

app/src/androidTest/java/com/android/streetworkapp/ui/navigation/BottomNavigationTest.kt

@@ -5,6 +5,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsNotDisplayed
@@ -34,6 +35,8 @@ import com.android.streetworkapp.model.user.UserRepository
 import com.android.streetworkapp.model.user.UserViewModel
 import com.android.streetworkapp.model.workout.WorkoutRepository
 import com.android.streetworkapp.model.workout.WorkoutViewModel
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.FirebaseAuth
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
@@ -128,6 +131,8 @@ class BottomNavigationTest {
           TextModerationViewModel(mock(TextModerationRepository::class.java, RETURNS_DEFAULTS)),
           ImageViewModel(mock(ImageRepository::class.java)),
           PreferencesViewModel(mock(PreferencesRepository::class.java)),
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current),
           true)
     }
 

app/src/androidTest/java/com/android/streetworkapp/ui/navigation/TopAppBarTest.kt

@@ -1,6 +1,7 @@
 package com.android.streetworkapp.ui.navigation
 
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsNotDisplayed
 import androidx.compose.ui.test.assertTextEquals
@@ -25,6 +26,8 @@ import com.android.streetworkapp.model.user.UserRepository
 import com.android.streetworkapp.model.user.UserViewModel
 import com.android.streetworkapp.model.workout.WorkoutRepository
 import com.android.streetworkapp.model.workout.WorkoutViewModel
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.FirebaseAuth
 import io.mockk.mockk
 import org.junit.Rule
 import org.junit.Test
@@ -65,6 +68,8 @@ class TopAppBarTest {
           TextModerationViewModel(mock(TextModerationRepository::class.java)),
           ImageViewModel(mock(ImageRepository::class.java)),
           PreferencesViewModel(mock(PreferencesRepository::class.java)),
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current),
           true)
     }
 

app/src/androidTest/java/com/android/streetworkapp/ui/profile/SettingsTest.kt

@@ -12,23 +12,31 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.sample.R
+import com.android.streetworkapp.model.preferences.PreferencesRepository
+import com.android.streetworkapp.model.preferences.PreferencesViewModel
 import com.android.streetworkapp.model.user.User
 import com.android.streetworkapp.model.user.UserRepository
 import com.android.streetworkapp.model.user.UserViewModel
 import com.android.streetworkapp.ui.navigation.NavigationActions
+import com.android.streetworkapp.ui.navigation.Route
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.FirebaseAuth
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito
+import org.mockito.Mockito.RETURNS_DEFAULTS
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.verify
 
 @RunWith(AndroidJUnit4::class)
 class SettingsTest {
 
   @get:Rule val composeTestRule = createComposeRule()
 
-  private val navigationActions = Mockito.mock(NavigationActions::class.java)
-  private val userRepository = Mockito.mock(UserRepository::class.java)
+  private val navigationActions = mock(NavigationActions::class.java)
+  private val userRepository = mock(UserRepository::class.java)
   private val userViewModel = UserViewModel(userRepository)
+  private val preferencesViewModel = PreferencesViewModel(mock(PreferencesRepository::class.java))
 
   @Test
   fun isSettingsContentDisplayedForNullUser() {
@@ -37,7 +45,11 @@ class SettingsTest {
     var context: Context? = null
 
     composeTestRule.setContent {
-      SettingsContent(navigationActions, userViewModel, showSettingDialog)
+      val authService =
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current)
+      SettingsContent(
+          navigationActions, userViewModel, preferencesViewModel, authService, showSettingDialog)
       context = LocalContext.current
     }
 
@@ -70,7 +82,11 @@ class SettingsTest {
     userViewModel.setCurrentUser(alice)
 
     composeTestRule.setContent {
-      SettingsContent(navigationActions, userViewModel, showSettingDialog)
+      val authService =
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current)
+      SettingsContent(
+          navigationActions, userViewModel, preferencesViewModel, authService, showSettingDialog)
       context = LocalContext.current
     }
 
@@ -89,4 +105,28 @@ class SettingsTest {
 
     composeTestRule.onNodeWithTag("deleteAccountDialog").assertIsDisplayed()
   }
+
+  @Test
+  fun testLogoutButtonNavigatesToAuthScreen() {
+    val showSettingDialog = mutableStateOf(false)
+    var context: Context? = null
+    val alice = User("uid-alice", "Alice", "alice@gmail.com", 42, emptyList(), "")
+    userViewModel.setCurrentUser(alice)
+
+    composeTestRule.setContent {
+      val authService =
+          GoogleAuthService(
+              "abc", mock(FirebaseAuth::class.java, RETURNS_DEFAULTS), LocalContext.current)
+      SettingsContent(
+          navigationActions, userViewModel, preferencesViewModel, authService, showSettingDialog)
+      context = LocalContext.current
+    }
+
+    // Click the logout button
+    composeTestRule.onNodeWithTag("LogOutButton").performClick()
+    composeTestRule.waitForIdle()
+
+    // Verify that the navigation action to the AUTH screen was called
+    verify(navigationActions).navigateTo(Route.AUTH)
+  }
 }

app/src/main/java/com/android/streetworkapp/MainActivity.kt

@@ -20,12 +20,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import androidx.navigation.navigation
+import com.android.sample.R
 import com.android.streetworkapp.device.network.isInternetAvailable
 import com.android.streetworkapp.model.event.EventRepositoryFirestore
 import com.android.streetworkapp.model.event.EventViewModel
@@ -80,8 +82,10 @@ import com.android.streetworkapp.ui.tutorial.TutorialEvent
 import com.android.streetworkapp.ui.utils.CustomDialog
 import com.android.streetworkapp.ui.utils.DialogType
 import com.android.streetworkapp.ui.utils.trainComposable
+import com.android.streetworkapp.utils.GoogleAuthService
+import com.google.firebase.auth.ktx.auth
 import com.google.firebase.firestore.FirebaseFirestore
-import kotlinx.serialization.json.JsonNull.content
+import com.google.firebase.ktx.Firebase
 import okhttp3.OkHttpClient
 
 class MainActivity : ComponentActivity() {
@@ -146,6 +150,10 @@ fun StreetWorkAppMain(
   val imageRepository = ImageRepositoryFirestore(firestoreDB, parkRepository, userRepository)
   val imageViewModel = ImageViewModel(imageRepository)
 
+  // Instantiate Google Auth Service
+  val token = stringResource(R.string.default_web_client_id)
+  val authService = GoogleAuthService(token, Firebase.auth, LocalContext.current)
+
   // Get the preferences cached parameters
   val loginState by preferencesViewModel.loginState.collectAsState()
   val uid by preferencesViewModel.uid.collectAsState()
@@ -199,6 +207,7 @@ fun StreetWorkAppMain(
         textModerationViewModel,
         imageViewModel,
         preferencesViewModel,
+        authService,
         startDestination = resolvedStartDestination!!)
   }
 }
@@ -218,6 +227,7 @@ fun StreetWorkApp(
     textModerationViewModel: TextModerationViewModel,
     imageViewModel: ImageViewModel,
     preferencesViewModel: PreferencesViewModel,
+    authService: GoogleAuthService,
     navTestInvokationOnEachRecompose: Boolean = false,
     e2eEventTesting: Boolean = false,
     startDestination: String = Route.AUTH
@@ -305,7 +315,7 @@ fun StreetWorkApp(
               route = Route.AUTH,
           ) {
             composable(Screen.AUTH) {
-              SignInScreen(navigationActions, userViewModel, preferencesViewModel)
+              SignInScreen(navigationActions, userViewModel, preferencesViewModel, authService)
             }
           }
           navigation(startDestination = Screen.PROGRESSION, route = Route.PROGRESSION) {
@@ -389,7 +399,12 @@ fun StreetWorkApp(
                   tag = "Settings",
                   title = "Settings",
                   Content = {
-                    SettingsContent(navigationActions, userViewModel, showSettingsDialog)
+                    SettingsContent(
+                        navigationActions,
+                        userViewModel,
+                        preferencesViewModel,
+                        authService,
+                        showSettingsDialog)
                   },
               )
             }

app/src/main/java/com/android/streetworkapp/model/user/UserViewModel.kt

@@ -27,6 +27,15 @@ open class UserViewModel(private val repository: UserRepository) : ViewModel() {
   val userList: StateFlow<List<User?>>
     get() = _userList
 
+  /**
+   * Sets the user to the provided User object.
+   *
+   * @param user The User object to set as the user.
+   */
+  fun setUser(user: User?) {
+    _user.value = user
+  }
+
   /**
    * Sets the current user to the provided User object.
    *

app/src/main/java/com/android/streetworkapp/ui/authentication/GoogleAuthButton.kt

@@ -33,14 +33,13 @@ import com.android.streetworkapp.utils.GoogleAuthService
 @Composable
 fun GoogleAuthButton(
     authService: GoogleAuthService,
-    context: android.content.Context,
     launcher: ManagedActivityResultLauncher<Intent, ActivityResult>
 ) {
 
   Button(
       onClick = {
         Log.d("SignInScreen", "Start sign-in")
-        authService.launchSignIn(context, launcher)
+        authService.launchSignIn(launcher)
       },
       modifier =
           Modifier.width(250.dp)