Fix #12, #16, #18: Add GitHub OAuth, error handling, and navigation

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -22,12 +24,39 @@ android {
     }
 
     buildTypes {
+        val properties = Properties().apply {
+            val localPropertiesFile = project.rootProject.file("local.properties")
+            if (localPropertiesFile.exists()) {
+                load(localPropertiesFile.inputStream())
+            }
+        }
+
         debug {
             buildConfigField("String", "BASE_URL", "\"https://api.github.com/\"")
+            buildConfigField(
+                "String",
+                "CLIENT_ID",
+                "\"${properties.getProperty("CLIENT_ID", "dummy_client_id")}\""
+            )
+            buildConfigField(
+                "String",
+                "CLIENT_SECRET",
+                "\"${properties.getProperty("CLIENT_SECRET", "dummy_client_secret")}\""
+            )
         }
         release {
             isMinifyEnabled = false
             buildConfigField("String", "BASE_URL", "\"https://api.github.com/\"")
+            buildConfigField(
+                "String",
+                "CLIENT_ID",
+                "\"${properties.getProperty("CLIENT_ID", "dummy_client_id")}\""
+            )
+            buildConfigField(
+                "String",
+                "CLIENT_SECRET",
+                "\"${properties.getProperty("CLIENT_SECRET", "dummy_client_secret")}\""
+            )
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -48,6 +77,13 @@ android {
         buildConfig = true
         compose = true
     }
+
+    packaging {
+        resources {
+            excludes += "META-INF/LICENSE.md"
+            excludes += "META-INF/LICENSE-notice.md"
+        }
+    }
 }
 
 dependencies {
@@ -59,9 +95,14 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.bundles.ktor)
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.dagger.hilt)
+    implementation(libs.hilt.navigation.compose)
+    implementation(libs.androidx.splash.screen)
+    implementation(libs.androidx.junit.ktx)
+
     ksp(libs.dagger.hilt.compiler)
 
     testImplementation(libs.junit)
@@ -70,11 +111,14 @@ dependencies {
     testImplementation(libs.ktor.client.mock)
     testImplementation(libs.mockk)
 
-    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.truth)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     androidTestImplementation(libs.dagger.hilt.testing)
+    androidTestImplementation(libs.ktor.client.mock)
+    androidTestImplementation(libs.kotlinx.coroutines.test)
+    androidTestImplementation(libs.mockk.android)
     kspAndroidTest(libs.dagger.hilt.compiler)
 
     debugImplementation(libs.androidx.ui.tooling)

app/src/androidTest/java/com/notifier/app/auth/presentation/login/LoginScreenTest.kt

@@ -0,0 +1,84 @@
+package com.notifier.app.auth.presentation.login
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+
+class LoginScreenTest {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun testLoginScreen_whenStatusIsNull_showsProgressAndMessage() {
+        composeRule.setContent {
+            LoginScreen(
+                state = LoginState(status = null),
+                onLoginButtonClick = {}
+            )
+        }
+
+        composeRule
+            .onNode(hasTestTag(TEST_TAG_CIRCULAR_PROGRESS_INDICATOR))
+            .assertExists()
+
+        composeRule
+            .onNodeWithText("Verifying authentication status…")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testLoginScreen_whenLoading_showsProgressAndMessage() {
+        composeRule.setContent {
+            LoginScreen(
+                state = LoginState(status = LoginStatus.LOADING),
+                onLoginButtonClick = {}
+            )
+        }
+
+        composeRule
+            .onNode(hasTestTag(TEST_TAG_CIRCULAR_PROGRESS_INDICATOR))
+            .assertExists()
+
+        composeRule
+            .onNodeWithText("Verifying authentication status…")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testLoginScreen_whenLoggedOut_showsLoginButton_clickTriggersCallback() {
+        var loginButtonClicked = false
+
+        composeRule.setContent {
+            LoginScreen(
+                state = LoginState(status = LoginStatus.LOGGED_OUT),
+                onLoginButtonClick = { loginButtonClicked = true }
+            )
+        }
+
+        composeRule
+            .onNodeWithText("Login with GitHub")
+            .assertIsDisplayed()
+            .performClick()
+
+        assertThat(loginButtonClicked).isTrue()
+    }
+
+    @Test
+    fun testLoginScreen_whenLoggedIn_showsSuccessMessage() {
+        composeRule.setContent {
+            LoginScreen(
+                state = LoginState(status = LoginStatus.LOGGED_IN),
+                onLoginButtonClick = {}
+            )
+        }
+
+        composeRule
+            .onNodeWithText("Logged in successfully! Redirecting…")
+            .assertIsDisplayed()
+    }
+}

app/src/androidTest/java/com/notifier/app/auth/presentation/login/LoginViewModelTest.kt

@@ -0,0 +1,97 @@
+package com.notifier.app.auth.presentation.login
+
+import com.google.common.truth.Truth.assertThat
+import com.notifier.app.core.data.persistence.DataStoreManager
+import com.notifier.app.core.domain.util.PersistenceError
+import com.notifier.app.core.domain.util.Result
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+
+class LoginViewModelTest {
+    private lateinit var dataStoreManager: DataStoreManager
+
+    private lateinit var viewModel: LoginViewModel
+
+    @Before
+    fun setUp() {
+        dataStoreManager = mockk()
+        viewModel = LoginViewModel(dataStoreManager)
+    }
+
+    @Test
+    fun testAuthStatus_tokenIsValid_setsStateToLoggedInEventually() = runTest {
+        coEvery {
+            dataStoreManager.getAccessToken()
+        } returns Result.Success("dummy_valid_token")
+
+        val stateStatuses = viewModel.state
+            .take(3)
+            .map { it.status }
+            .toList()
+
+        assertThat(stateStatuses).containsExactly(
+            null,
+            LoginStatus.LOADING,
+            LoginStatus.LOGGED_IN
+        ).inOrder()
+    }
+
+    @Test
+    fun testAuthStatus_tokenIsBlank_setsStateToLoggedOutEventually() = runTest {
+        coEvery {
+            dataStoreManager.getAccessToken()
+        } returns Result.Success("")
+
+        val stateStatuses = viewModel.state
+            .take(3)
+            .map { it.status }
+            .toList()
+
+        assertThat(stateStatuses).containsExactly(
+            null,
+            LoginStatus.LOADING,
+            LoginStatus.LOGGED_OUT
+        ).inOrder()
+    }
+
+    @Test
+    fun testAuthStatus_errorFetchingToken_setsStateToLoggedOutEventually() = runTest {
+        coEvery {
+            dataStoreManager.getAccessToken()
+        } returns Result.Error(PersistenceError.IO)
+
+        val stateStatuses = viewModel.state
+            .take(3)
+            .map { it.status }
+            .toList()
+
+        assertThat(stateStatuses).containsExactly(
+            null,
+            LoginStatus.LOADING,
+            LoginStatus.LOGGED_OUT
+        ).inOrder()
+    }
+
+    @Test
+    fun testOnAction_onLoginButtonClick_emitsNavigateToGitHubAuthEvent() = runTest {
+        viewModel.onAction(LoginAction.OnLoginButtonClick)
+
+        val event = viewModel.events.first()
+        assertThat(event).isEqualTo(LoginEvent.NavigateToGitHubAuth)
+    }
+
+    @Test
+    fun testOnAction_onUserLoggedIn_emitsNavigateToHomeScreenEvent() = runTest {
+        viewModel.onAction(LoginAction.OnUserLoggedIn)
+
+        val event = viewModel.events.first()
+        assertThat(event).isEqualTo(LoginEvent.NavigateToHomeScreen)
+    }
+}

app/src/androidTest/java/com/notifier/app/auth/presentation/setup/SetupScreenTest.kt

@@ -0,0 +1,81 @@
+package com.notifier.app.auth.presentation.setup
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+
+class SetupScreenTest {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun testSetupScreen_whenFetchingToken_showsConnectingMessage() {
+        composeRule.setContent {
+            SetupScreen(
+                state = SetupState(setupStep = SetupStep.FETCHING_TOKEN),
+                onAction = {}
+            )
+        }
+
+        composeRule
+            .onNodeWithText("Connecting to GitHub…")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testSetupScreen_whenSavingToken_showsSavingMessage() {
+        composeRule.setContent {
+            SetupScreen(
+                state = SetupState(setupStep = SetupStep.SAVING_TOKEN),
+                onAction = {}
+            )
+        }
+
+        composeRule
+            .onNodeWithText("Saving user information…")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testSetupScreen_whenSuccess_showsSuccessMessageAndContinueButton_clickTriggersCallback() {
+        var capturedAction: SetupAction? = null
+
+        composeRule.setContent {
+            SetupScreen(
+                state = SetupState(setupStep = SetupStep.SUCCESS),
+                onAction = {
+                    capturedAction = it
+                }
+            )
+        }
+
+        composeRule
+            .onNodeWithText("Connected successfully!")
+            .assertIsDisplayed()
+
+        composeRule
+            .onNodeWithText("Continue")
+            .assertIsDisplayed()
+            .performClick()
+
+        assertThat(capturedAction).isEqualTo(SetupAction.OnContinueButtonClick)
+    }
+
+    @Test
+    fun testSetupScreen_whenFailed_showsErrorMessage() {
+        composeRule.setContent {
+            SetupScreen(
+                state = SetupState(setupStep = SetupStep.FAILED),
+                onAction = {}
+            )
+        }
+
+        composeRule
+            .onNodeWithText("Connection failed. Please try again.")
+            .assertIsDisplayed()
+    }
+}